diff options
author | Jeremy Allison <jra@samba.org> | 2007-12-03 17:57:46 -0800 |
---|---|---|
committer | Jeremy Allison <jra@samba.org> | 2007-12-03 17:57:46 -0800 |
commit | 328a57e1ca5fc0e0206fdb565d5951912e84dc5e (patch) | |
tree | 4bb6f8476e33c8fc297d24c1019aefb9fd794830 /source3/winbindd/winbindd_dual.c | |
parent | 6f46f75dfc2c80b99a6a5fb277bab456a5fd247b (diff) | |
download | samba-328a57e1ca5fc0e0206fdb565d5951912e84dc5e.tar.gz samba-328a57e1ca5fc0e0206fdb565d5951912e84dc5e.tar.bz2 samba-328a57e1ca5fc0e0206fdb565d5951912e84dc5e.zip |
Remove more pstrings, from the winbindd protocol def and
inside winbindd. Remove unused pstring types.
Jeremy.
(This used to be commit 9ccac8abb0420393569dbca73e7daf2742aa1099)
Diffstat (limited to 'source3/winbindd/winbindd_dual.c')
-rw-r--r-- | source3/winbindd/winbindd_dual.c | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/source3/winbindd/winbindd_dual.c b/source3/winbindd/winbindd_dual.c index c15af710f4..91e60cca36 100644 --- a/source3/winbindd/winbindd_dual.c +++ b/source3/winbindd/winbindd_dual.c @@ -471,11 +471,15 @@ void setup_domain_child(struct winbindd_domain *domain, const char *explicit_logfile) { if (explicit_logfile != NULL) { - pstr_sprintf(child->logfilename, "%s/log.winbindd-%s", - dyn_LOGFILEBASE, explicit_logfile); + if (asprintf(&child->logfilename, "%s/log.winbindd-%s", + dyn_LOGFILEBASE, explicit_logfile) < 0) { + smb_panic("Internal error: asprintf failed"); + } } else if (domain != NULL) { - pstr_sprintf(child->logfilename, "%s/log.wb-%s", - dyn_LOGFILEBASE, domain->name); + if (asprintf(&child->logfilename, "%s/log.wb-%s", + dyn_LOGFILEBASE, domain->name) < 0) { + smb_panic("Internal error: asprintf failed"); + } } else { smb_panic("Internal error: domain == NULL && " "explicit_logfile == NULL"); @@ -507,6 +511,7 @@ void winbind_child_died(pid_t pid) child->event.fd = 0; child->event.flags = 0; child->pid = 0; + SAFE_FREE(child->logfilename); schedule_async_request(child); } |