diff options
| author | Jeremy Allison <jra@samba.org> | 2008-11-11 10:20:24 -0800 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 2008-11-11 10:20:24 -0800 |
| commit | 4f2635b729e636e123afacb0970c3d49343b3e90 (patch) | |
| tree | 76d632982f23f08b23593af78614e9414dbbac2c /source3/lib/util.c | |
| parent | 8cb23a6b2950d7419767845b6097470f76f348a7 (diff) | |
| parent | 2e6bf03e519e180a1ee672dc9c9171d9e0cd114f (diff) | |
| download | samba-4f2635b729e636e123afacb0970c3d49343b3e90.tar.gz samba-4f2635b729e636e123afacb0970c3d49343b3e90.tar.bz2 samba-4f2635b729e636e123afacb0970c3d49343b3e90.zip | |
Merge branch 'master' of ssh://jra@git.samba.org/data/git/samba
Diffstat (limited to 'source3/lib/util.c')
| -rw-r--r-- | source3/lib/util.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source3/lib/util.c b/source3/lib/util.c index 820cf376be..5007fb72ef 100644 --- a/source3/lib/util.c +++ b/source3/lib/util.c @@ -1497,7 +1497,7 @@ uid_t nametouid(const char *name) char *p; uid_t u; - pass = getpwnam_alloc(NULL, name); + pass = getpwnam_alloc(talloc_autofree_context(), name); if (pass) { u = pass->pw_uid; TALLOC_FREE(pass); @@ -2255,8 +2255,8 @@ char *myhostname(void) static char *ret; if (ret == NULL) { /* This is cached forever so - * use NULL talloc ctx. */ - ret = talloc_get_myname(NULL); + * use talloc_autofree_context() ctx. */ + ret = talloc_get_myname(talloc_autofree_context()); } return ret; } |