diff options
| author | Jeremy Allison <jra@samba.org> | 2010-03-15 10:33:09 -0700 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 2010-03-15 14:48:54 -0700 |
| commit | 4b85a0ea7fe036347b9fe5c725e55b043f75ccb4 (patch) | |
| tree | 33c588f05e060adaf709cdbd42ee1bae86d59d32 /source3/smbd/lanman.c | |
| parent | 83b9e12513984af8b372f5558043ed0f65d832fd (diff) | |
| download | samba-4b85a0ea7fe036347b9fe5c725e55b043f75ccb4.tar.gz samba-4b85a0ea7fe036347b9fe5c725e55b043f75ccb4.tar.bz2 samba-4b85a0ea7fe036347b9fe5c725e55b043f75ccb4.zip | |
Rever e80ceb1d7355c8c46a2ed90d5721cf367640f4e8 "Remove more uses of "extern struct current_user current_user;"."
As requested by Volker, split this into smaller commits.
Jeremy.
Diffstat (limited to 'source3/smbd/lanman.c')
| -rw-r--r-- | source3/smbd/lanman.c | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/source3/smbd/lanman.c b/source3/smbd/lanman.c index 4c15f133ae..dab26d0abe 100644 --- a/source3/smbd/lanman.c +++ b/source3/smbd/lanman.c @@ -3767,9 +3767,7 @@ static bool api_RNetUserGetInfo(connection_struct *conn, uint16 vuid, vuser->server_info->sam_account); } /* modelled after NTAS 3.51 reply */ - SSVAL(p,usri11_priv, - (get_current_uid(conn) == (uid_t)0)? - USER_PRIV_ADMIN:USER_PRIV_USER); + SSVAL(p,usri11_priv,conn->admin_user?USER_PRIV_ADMIN:USER_PRIV_USER); SIVAL(p,usri11_auth_flags,AF_OP_PRINT); /* auth flags */ SIVALS(p,usri11_password_age,-1); /* password age */ SIVAL(p,usri11_homedir,PTR_DIFF(p2,p)); /* home dir */ @@ -3822,8 +3820,7 @@ static bool api_RNetUserGetInfo(connection_struct *conn, uint16 vuid, memset(p+22,' ',16); /* password */ SIVALS(p,38,-1); /* password age */ SSVAL(p,42, - (get_current_uid(conn) == (uid_t)0)? - USER_PRIV_ADMIN:USER_PRIV_USER); + conn->admin_user?USER_PRIV_ADMIN:USER_PRIV_USER); SIVAL(p,44,PTR_DIFF(p2,*rdata)); /* home dir */ strlcpy(p2, vuser ? pdb_get_homedir( vuser->server_info->sam_account) : "", @@ -3974,9 +3971,7 @@ static bool api_WWkstaUserLogon(connection_struct *conn,uint16 vuid, PACKI(&desc,"W",0); /* code */ PACKS(&desc,"B21",name); /* eff. name */ PACKS(&desc,"B",""); /* pad */ - PACKI(&desc,"W", - (get_current_uid(conn) == (uid_t)0)? - USER_PRIV_ADMIN:USER_PRIV_USER); + PACKI(&desc,"W", conn->admin_user?USER_PRIV_ADMIN:USER_PRIV_USER); PACKI(&desc,"D",0); /* auth flags XXX */ PACKI(&desc,"W",0); /* num logons */ PACKI(&desc,"W",0); /* bad pw count */ |