mirror of
https://github.com/samba-team/samba.git
synced 2025-03-09 08:58:35 +03:00
ipc.c: Added ERROR_MORE_DATA error if client buffer too small.
server.c: Allow admin_user on read only shares. I think this is safe but it needs looking at. Jeremy (jallison@whistle.com) (This used to be commit cc50955a2760f1de7e80b91408a7c0806f6eb44c)
This commit is contained in:
parent
ed61181f29
commit
b0bdb42bd1
@ -1074,7 +1074,7 @@ static BOOL api_RNetServerEnum(int cnum, uint16 vuid, char *param, char *data,
|
|||||||
|
|
||||||
*rparam_len = 8;
|
*rparam_len = 8;
|
||||||
*rparam = REALLOC(*rparam,*rparam_len);
|
*rparam = REALLOC(*rparam,*rparam_len);
|
||||||
SSVAL(*rparam,0,NERR_Success);
|
SSVAL(*rparam,0,(missed == 0 ? NERR_Success : ERROR_MORE_DATA));
|
||||||
SSVAL(*rparam,2,0);
|
SSVAL(*rparam,2,0);
|
||||||
SSVAL(*rparam,4,counted);
|
SSVAL(*rparam,4,counted);
|
||||||
SSVAL(*rparam,6,counted+missed);
|
SSVAL(*rparam,6,counted+missed);
|
||||||
|
@ -3167,8 +3167,17 @@ int make_connection(char *service,char *user,char *password, int pwlen, char *de
|
|||||||
}
|
}
|
||||||
|
|
||||||
/* admin user check */
|
/* admin user check */
|
||||||
if (user_in_list(user,lp_admin_users(snum)) &&
|
|
||||||
!pcon->read_only)
|
/* JRA - original code denied admin user if the share was
|
||||||
|
marked read_only. Changed as I don't think this is needed,
|
||||||
|
but old code left in case there is a problem here.
|
||||||
|
*/
|
||||||
|
if (user_in_list(user,lp_admin_users(snum))
|
||||||
|
#if 0
|
||||||
|
&& !pcon->read_only)
|
||||||
|
#else
|
||||||
|
)
|
||||||
|
#endif
|
||||||
{
|
{
|
||||||
pcon->admin_user = True;
|
pcon->admin_user = True;
|
||||||
DEBUG(0,("%s logged in as admin user (root privileges)\n",user));
|
DEBUG(0,("%s logged in as admin user (root privileges)\n",user));
|
||||||
|
Loading…
x
Reference in New Issue
Block a user