[GLUE] Rsync SAMBA_3_2_0 SVN r25598 in order to create the v3-2-test branch.

[samba.git] / source / smbd / utmp.c

diff --git a/source/smbd/utmp.c b/source/smbd/utmp.c
index 7f437407549094ba525366b6ef452d3e222ae133..52174c4d8379484a27ea88e087ecd84a318fe8ce 100644 (file)
--- 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);