isa/sudo
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Can't call debug code in the process_hooks_xxx functions() since

Browse Source 
ctime() may look up the timezone via the TZ environment variable.
This commit is contained in:
Todd C. Miller
2012-08-13 14:39:40 -04:00
parent e4e815dd82
commit f32aaed29d
1 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/hooks.c
View File

@@ -60,12 +60,12 @@ static struct sudo_hook_list *sudo_hook_unsetenv_list;
static struct sudo_hook_list *sudo_hook_getenv_list; static struct sudo_hook_list *sudo_hook_getenv_list;
static struct sudo_hook_list *sudo_hook_putenv_list; static struct sudo_hook_list *sudo_hook_putenv_list;
/* NOTE: must not anything that might call setenv() */
int int
process_hooks_setenv(const char *name, const char *value, int overwrite) process_hooks_setenv(const char *name, const char *value, int overwrite)
{ {
struct sudo_hook_list *hook; struct sudo_hook_list *hook;
int rc = SUDO_HOOK_RET_NEXT; int rc = SUDO_HOOK_RET_NEXT;
debug_decl(process_hooks_setenv, SUDO_DEBUG_HOOKS)
/* First process the hooks. */ /* First process the hooks. */
for (hook = sudo_hook_setenv_list; hook != NULL; hook = hook->next) { for (hook = sudo_hook_setenv_list; hook != NULL; hook = hook->next) {
@@ -77,20 +77,20 @@ process_hooks_setenv(const char *name, const char *value, int overwrite)
case SUDO_HOOK_RET_STOP: case SUDO_HOOK_RET_STOP:
goto done; goto done;
default: default:
warningx("invalid setenv hook return value: %d", rc); warningx2("invalid setenv hook return value: %d", rc);
break; break;
} }
} }
done: done:
debug_return_int(rc); return rc;
} }
/* NOTE: must not anything that might call putenv() */
int int
process_hooks_putenv(char *string) process_hooks_putenv(char *string)
{ {
struct sudo_hook_list *hook; struct sudo_hook_list *hook;
int rc = SUDO_HOOK_RET_NEXT; int rc = SUDO_HOOK_RET_NEXT;
debug_decl(process_hooks_putenv, SUDO_DEBUG_HOOKS)
/* First process the hooks. */ /* First process the hooks. */
for (hook = sudo_hook_putenv_list; hook != NULL; hook = hook->next) { for (hook = sudo_hook_putenv_list; hook != NULL; hook = hook->next) {
@@ -102,21 +102,21 @@ process_hooks_putenv(char *string)
case SUDO_HOOK_RET_STOP: case SUDO_HOOK_RET_STOP:
goto done; goto done;
default: default:
warningx("invalid putenv hook return value: %d", rc); warningx2("invalid putenv hook return value: %d", rc);
break; break;
} }
} }
done: done:
debug_return_int(rc); return rc;
} }
/* NOTE: must not anything that might call getenv() */
int int
process_hooks_getenv(const char *name, char **value) process_hooks_getenv(const char *name, char **value)
{ {
struct sudo_hook_list *hook; struct sudo_hook_list *hook;
char *val = NULL; char *val = NULL;
int rc = SUDO_HOOK_RET_NEXT; int rc = SUDO_HOOK_RET_NEXT;
debug_decl(process_hooks_getenv, SUDO_DEBUG_HOOKS)
/* First process the hooks. */ /* First process the hooks. */
for (hook = sudo_hook_getenv_list; hook != NULL; hook = hook->next) { for (hook = sudo_hook_getenv_list; hook != NULL; hook = hook->next) {
@@ -128,22 +128,22 @@ process_hooks_getenv(const char *name, char **value)
case SUDO_HOOK_RET_STOP: case SUDO_HOOK_RET_STOP:
goto done; goto done;
default: default:
warningx("invalid getenv hook return value: %d", rc); warningx2("invalid getenv hook return value: %d", rc);
break; break;
} }
} }
done: done:
if (val != NULL) if (val != NULL)
*value = val; *value = val;
debug_return_int(rc); return rc;
} }
/* NOTE: must not anything that might call unsetenv() */
int int
process_hooks_unsetenv(const char *name) process_hooks_unsetenv(const char *name)
{ {
struct sudo_hook_list *hook; struct sudo_hook_list *hook;
int rc = SUDO_HOOK_RET_NEXT; int rc = SUDO_HOOK_RET_NEXT;
debug_decl(process_hooks_unsetenv, SUDO_DEBUG_HOOKS)
/* First process the hooks. */ /* First process the hooks. */
for (hook = sudo_hook_unsetenv_list; hook != NULL; hook = hook->next) { for (hook = sudo_hook_unsetenv_list; hook != NULL; hook = hook->next) {
@@ -155,12 +155,12 @@ process_hooks_unsetenv(const char *name)
case SUDO_HOOK_RET_STOP: case SUDO_HOOK_RET_STOP:
goto done; goto done;
default: default:
warningx("invalid unsetenv hook return value: %d", rc); warningx2("invalid unsetenv hook return value: %d", rc);
break; break;
} }
} }
done: done:
debug_return_int(rc); return rc;
} }
/* Hook registration internals. */ /* Hook registration internals. */