diff options
author | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 15:34:30 -0500 |
---|---|---|
committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 15:34:30 -0500 |
commit | 5c6c8e1fe93f340005110a7833946191659d88ab (patch) | |
tree | 2572b9fe2367388eac54ac08ead007323618f0a6 /source/smbd/utmp.c | |
parent | ba8c48244e140403b728d9a2ca297b40e8888964 (diff) | |
download | samba-5c6c8e1fe93f340005110a7833946191659d88ab.tar.gz samba-5c6c8e1fe93f340005110a7833946191659d88ab.tar.xz samba-5c6c8e1fe93f340005110a7833946191659d88ab.zip |
[GLUE] Rsync SAMBA_3_2_0 SVN r25598 in order to create the v3-2-test branch.samba-misc-tags/initial-v3-2-test
Diffstat (limited to 'source/smbd/utmp.c')
-rw-r--r-- | source/smbd/utmp.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/smbd/utmp.c b/source/smbd/utmp.c index 7f437407549..52174c4d837 100644 --- a/source/smbd/utmp.c +++ b/source/smbd/utmp.c @@ -220,13 +220,13 @@ static void uw_pathname(pstring fname, const char *uw_name, const char *uw_defau } /* For u-files and non-explicit w-dir, look for "utmp dir" */ - if (strlen(dirname) == 0) { + if (dirname == 0 || strlen(dirname) == 0) { pstrcpy(dirname,lp_utmpdir()); trim_char(dirname,'\0','/'); } /* If explicit directory above, use it */ - if (strlen(dirname) != 0) { + if (dirname != 0 && strlen(dirname) != 0) { pstrcpy(fname, dirname); pstrcat(fname, "/"); pstrcat(fname, uw_name); |