extern struct request_msg request_mbuf;
extern char *serviceuser, *service, *logname, *cwd;
extern char *overridedata, *userrcfile;
-extern char *serviceuser_dir, *serviceuser_shell;
-extern uid_t serviceuser_uid;
+extern char *serviceuser_dir, *serviceuser_shell, *callinguser_shell;
+extern uid_t serviceuser_uid, callinguser_uid;
extern gid_t serviceuser_gid;
extern char *execpath, **execargs;
extern int execute; /* One of the execution modes tokt_execmode */