diff options
| author | Andrew Tridgell <tridge@samba.org> | 2000-05-04 16:01:47 +0000 |
|---|---|---|
| committer | Andrew Tridgell <tridge@samba.org> | 2000-05-04 16:01:47 +0000 |
| commit | f6844e0b7eb4412bc44c5533b09f856dc9272e75 (patch) | |
| tree | 442d0d97d908695260ac0521259e2d5968260749 /source3/include | |
| parent | f74ea2b78b2aaa4621936c87487f2e9c2072144f (diff) | |
| download | samba-f6844e0b7eb4412bc44c5533b09f856dc9272e75.tar.gz samba-f6844e0b7eb4412bc44c5533b09f856dc9272e75.tar.bz2 samba-f6844e0b7eb4412bc44c5533b09f856dc9272e75.zip | |
a minimal change to get appliance mode to work with winbindd
we needed to accept usernames of the form DOMAIN/user, which means we
needed to pass the domain to a getpwnam() like routine in certain
critical spots.
What I'd rather do is get rid of "char *user" everywhere and use the
new userdom_struct, but that will have to wait a few days.
(This used to be commit 8b7a10febead8be182e7d5b1d68259e31530b69c)
Diffstat (limited to 'source3/include')
| -rw-r--r-- | source3/include/proto.h | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/source3/include/proto.h b/source3/include/proto.h index c2fe1bf880..9487f4254c 100644 --- a/source3/include/proto.h +++ b/source3/include/proto.h @@ -288,6 +288,8 @@ char *get_user_home_dir(char *user); BOOL map_username(char *user); struct passwd *Get_Pwnam(char *user,BOOL allow_change); BOOL user_in_list(char *user,char *list); +struct passwd *smb_getpwnam(char *user, char *domain, BOOL allow_change); +int smb_initgroups(char *user, char *domain, gid_t group); /*The following definitions come from lib/util.c */ @@ -2039,7 +2041,7 @@ void init_net_user_info3(NET_USER_INFO_3 *usr, DOM_GID *gids, uint32 user_flgs, - char sess_key[16], + char *sess_key, char *logon_srv, char *logon_dom, @@ -3182,8 +3184,11 @@ BOOL set_challenge(unsigned char *challenge); user_struct *get_valid_user_struct(uint16 vuid); void invalidate_vuid(uint16 vuid); char *validated_username(uint16 vuid); -int setup_groups(char *user, uid_t uid, gid_t gid, int *p_ngroups, gid_t **p_groups); -uint16 register_vuid(uid_t uid,gid_t gid, char *unix_name, char *requested_name, BOOL guest); +char *validated_domain(uint16 vuid); +int setup_groups(char *user, char *domain, + uid_t uid, gid_t gid, int *p_ngroups, gid_t **p_groups); +uint16 register_vuid(uid_t uid,gid_t gid, char *unix_name, char *requested_name, + char *domain,BOOL guest); void add_session_user(char *user); BOOL smb_password_check(char *password, unsigned char *part_passwd, unsigned char *c8); BOOL smb_password_ok(struct smb_passwd *smb_pass, uchar chal[8], |