diff options
| author | Bo Yang <boyang@samba.org> | 2009-07-15 15:36:02 +0800 |
|---|---|---|
| committer | Bo Yang <boyang@samba.org> | 2009-07-15 17:05:46 +0800 |
| commit | 86865365ce487a8943370ea2f313000a6440ea9a (patch) | |
| tree | 544f1b81c5eebc42f365d8435586bc50a92d8ddc /source3 | |
| parent | 9ef6af73b319048fc6f3891573f0e10066dffee6 (diff) | |
| download | samba-86865365ce487a8943370ea2f313000a6440ea9a.tar.gz samba-86865365ce487a8943370ea2f313000a6440ea9a.tar.bz2 samba-86865365ce487a8943370ea2f313000a6440ea9a.zip | |
S3: Small fix to get rid of annoying log message.
Signed-off-by: Bo Yang <boyang@samba.org>
Diffstat (limited to 'source3')
| -rw-r--r-- | source3/param/loadparm.c | 3 | ||||
| -rw-r--r-- | source3/rpc_server/srv_srvsvc_nt.c | 6 |
2 files changed, 7 insertions, 2 deletions
diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c index 7b4e363f1b..4415804a2d 100644 --- a/source3/param/loadparm.c +++ b/source3/param/loadparm.c @@ -5142,6 +5142,9 @@ static char *lp_string(const char *s) #if 0 DEBUG(10, ("lp_string(%s)\n", s)); #endif + if (!s) { + return NULL; + } ret = talloc_sub_basic(ctx, get_current_username(), diff --git a/source3/rpc_server/srv_srvsvc_nt.c b/source3/rpc_server/srv_srvsvc_nt.c index 44acf4d647..c58c08ecdc 100644 --- a/source3/rpc_server/srv_srvsvc_nt.c +++ b/source3/rpc_server/srv_srvsvc_nt.c @@ -540,11 +540,13 @@ static WERROR init_srv_share_info_ctr(pipes_struct *p, if (lp_browseable(snum) && lp_snum_ok(snum) && is_enumeration_allowed(p, snum) && (all_shares || !is_hidden_share(snum)) ) { - DEBUG(10, ("counting service %s\n", lp_servicename(snum))); + DEBUG(10, ("counting service %s\n", + lp_servicename(snum) ? lp_servicename(snum) : "(null)")); allowed[snum] = true; num_entries++; } else { - DEBUG(10, ("NOT counting service %s\n", lp_servicename(snum))); + DEBUG(10, ("NOT counting service %s\n", + lp_servicename(snum) ? lp_servicename(snum) : "(null)")); } } |