diff options
author | Andrew Bartlett <abartlet@samba.org> | 2002-01-26 09:55:38 +0000 |
---|---|---|
committer | Andrew Bartlett <abartlet@samba.org> | 2002-01-26 09:55:38 +0000 |
commit | 06c79a1757fa953237239288a8736f30db61f193 (patch) | |
tree | 24b1107bd70b045ec1eef4dadf8db57a85744d37 /source3/nsswitch/winbindd_nss.h | |
parent | 4691c931e8a75b01d461395239f463258c1b12be (diff) | |
download | samba-06c79a1757fa953237239288a8736f30db61f193.tar.gz samba-06c79a1757fa953237239288a8736f30db61f193.tar.bz2 samba-06c79a1757fa953237239288a8736f30db61f193.zip |
Change the winbind interface to use seperate 'domain' and 'username' feilds for
the sid->uid and uid->sid conversions.
Remove some duplicate arguments from these funcitons, and update the
request/response structures for this and the 'winbind domain name' feature.
As such 'winbindd_lookup_name' now takes both a domain and username.
(This used to be commit ce1b4d4c309e4a60bec5a53224585bd504264672)
Diffstat (limited to 'source3/nsswitch/winbindd_nss.h')
-rw-r--r-- | source3/nsswitch/winbindd_nss.h | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/source3/nsswitch/winbindd_nss.h b/source3/nsswitch/winbindd_nss.h index a88b1209ab..5ab4f4d7c5 100644 --- a/source3/nsswitch/winbindd_nss.h +++ b/source3/nsswitch/winbindd_nss.h @@ -37,7 +37,7 @@ /* Update this when you change the interface. */ -#define WINBIND_INTERFACE_VERSION 2 +#define WINBIND_INTERFACE_VERSION 3 /* Socket commands */ @@ -91,6 +91,7 @@ enum winbindd_cmd { WINBINDD_CHECK_MACHACC, /* Check machine account pw works */ WINBINDD_PING, /* Just tell me winbind is running */ WINBINDD_INFO, /* Various bit of info. Currently just tidbits */ + WINBINDD_DOMAIN_NAME, /* The domain this winbind server is a member of (lp_workgroup()) */ /* Placeholder for end of cmd list */ @@ -128,7 +129,10 @@ struct winbindd_request { fstring newpass; } chauthtok; /* pam_winbind passwd module */ fstring sid; /* lookupsid, sid_to_[ug]id */ - fstring name; /* lookupname */ + struct { + fstring dom_name; /* lookupname */ + fstring name; + } name; uint32 num_entries; /* getpwent, getgrent */ } data; fstring domain; /* {set,get,end}{pw,gr}ent() */ @@ -183,7 +187,8 @@ struct winbindd_response { int type; } sid; struct winbindd_name { - fstring name; /* lookupsid */ + fstring dom_name; /* lookupsid */ + fstring name; int type; } name; uid_t uid; /* sid_to_uid */ @@ -192,6 +197,7 @@ struct winbindd_response { char winbind_separator; fstring samba_version; } info; + fstring domain_name; } data; /* Variable length return data */ |