sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-22 13:34:15 +03:00
Code

Remove more pstrings, from the winbindd protocol def and

Browse Source 
inside winbindd. Remove unused pstring types.
Jeremy.
(This used to be commit 9ccac8abb0)
This commit is contained in:
Jeremy Allison 2007-12-03 17:57:46 -08:00
parent 6f46f75dfc
commit 328a57e1ca
4 changed files with 16 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
source3/include/smb.h
View File

@ -150,10 +150,6 @@ typedef union unid_t {
typedef uint16 smb_ucs2_t;
/* ucs2 string types. */
typedef smb_ucs2_t wpstring[PSTRING_LEN];
typedef smb_ucs2_t wfstring[FSTRING_LEN];
#ifdef WORDS_BIGENDIAN
#define UCS2_SHIFT 8
#else

2
source3/nsswitch/winbind_struct_protocol.h
View File

@ -246,7 +246,7 @@ struct winbindd_request {
character is. */
fstring user;
fstring pass;
pstring require_membership_of_sid;
char require_membership_of_sid[1024];
fstring krb5_cc_type;
uid_t uid;
} auth; /* pam_winbind auth module */

2
source3/winbindd/winbindd.h
View File

@ -150,7 +150,7 @@ struct winbindd_child {
pid_t pid;
struct winbindd_domain *domain;
pstring logfilename;
char *logfilename;
struct fd_event event;
struct timed_event *lockout_policy_event;

13
source3/winbindd/winbindd_dual.c
View File

@ -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);
}