diff options
| author | Jeremy Allison <jra@samba.org> | 2005-06-24 20:25:18 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 10:58:00 -0500 |
| commit | 19ca97a70f6b7b41d251eaa76e4d3c980c6eedff (patch) | |
| tree | 18d7d81e2c1aa7cf9325899b7e8fc90b41c14c8b /source3/nsswitch/winbindd_user.c | |
| parent | 8387af752f81e26f1c141f6053bf6d106f0af5eb (diff) | |
| download | samba-19ca97a70f6b7b41d251eaa76e4d3c980c6eedff.tar.gz samba-19ca97a70f6b7b41d251eaa76e4d3c980c6eedff.tar.bz2 samba-19ca97a70f6b7b41d251eaa76e4d3c980c6eedff.zip | |
r7882: Looks like a large patch - but what it actually does is make Samba
safe for using our headers and linking with C++ modules. Stops us
from using C++ reserved keywords in our code.
Jeremy
(This used to be commit 9506b8e145982b1160a2f0aee5c9b7a54980940a)
Diffstat (limited to 'source3/nsswitch/winbindd_user.c')
| -rw-r--r-- | source3/nsswitch/winbindd_user.c | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/source3/nsswitch/winbindd_user.c b/source3/nsswitch/winbindd_user.c index 82ab79eb4c..576ceaea23 100644 --- a/source3/nsswitch/winbindd_user.c +++ b/source3/nsswitch/winbindd_user.c @@ -157,11 +157,11 @@ struct getpwsid_state { gid_t gid; }; -static void getpwsid_queryuser_recv(void *private, BOOL success, +static void getpwsid_queryuser_recv(void *private_data, BOOL success, const char *acct_name, const char *full_name, uint32 group_rid); -static void getpwsid_sid2uid_recv(void *private, BOOL success, uid_t uid); -static void getpwsid_sid2gid_recv(void *private, BOOL success, gid_t gid); +static void getpwsid_sid2uid_recv(void *private_data, BOOL success, uid_t uid); +static void getpwsid_sid2gid_recv(void *private_data, BOOL success, gid_t gid); static void winbindd_getpwsid(struct winbindd_cli_state *state, const DOM_SID *sid) @@ -192,12 +192,12 @@ static void winbindd_getpwsid(struct winbindd_cli_state *state, request_error(state); } -static void getpwsid_queryuser_recv(void *private, BOOL success, +static void getpwsid_queryuser_recv(void *private_data, BOOL success, const char *acct_name, const char *full_name, uint32 group_rid) { struct getpwsid_state *s = - talloc_get_type_abort(private, struct getpwsid_state); + talloc_get_type_abort(private_data, struct getpwsid_state); if (!success) { DEBUG(5, ("Could not query user %s\\%s\n", s->domain->name, @@ -215,10 +215,10 @@ static void getpwsid_queryuser_recv(void *private, BOOL success, getpwsid_sid2uid_recv, s); } -static void getpwsid_sid2uid_recv(void *private, BOOL success, uid_t uid) +static void getpwsid_sid2uid_recv(void *private_data, BOOL success, uid_t uid) { struct getpwsid_state *s = - talloc_get_type_abort(private, struct getpwsid_state); + talloc_get_type_abort(private_data, struct getpwsid_state); if (!success) { DEBUG(5, ("Could not query user's %s\\%s uid\n", @@ -232,10 +232,10 @@ static void getpwsid_sid2uid_recv(void *private, BOOL success, uid_t uid) getpwsid_sid2gid_recv, s); } -static void getpwsid_sid2gid_recv(void *private, BOOL success, gid_t gid) +static void getpwsid_sid2gid_recv(void *private_data, BOOL success, gid_t gid) { struct getpwsid_state *s = - talloc_get_type_abort(private, struct getpwsid_state); + talloc_get_type_abort(private_data, struct getpwsid_state); struct winbindd_pw *pw; fstring output_username; char *homedir; @@ -297,7 +297,7 @@ static void getpwsid_sid2gid_recv(void *private, BOOL success, gid_t gid) /* Return a password structure from a username. */ -static void getpwnam_name2sid_recv(void *private, BOOL success, +static void getpwnam_name2sid_recv(void *private_data, BOOL success, const DOM_SID *sid, enum SID_NAME_USE type); void winbindd_getpwnam(struct winbindd_cli_state *state) @@ -343,10 +343,10 @@ void winbindd_getpwnam(struct winbindd_cli_state *state) getpwnam_name2sid_recv, state); } -static void getpwnam_name2sid_recv(void *private, BOOL success, +static void getpwnam_name2sid_recv(void *private_data, BOOL success, const DOM_SID *sid, enum SID_NAME_USE type) { - struct winbindd_cli_state *state = private; + struct winbindd_cli_state *state = private_data; if (!success) { DEBUG(5, ("Could not lookup name for user %s\n", |