svn commit: samba r25256 - in branches/SAMBA_4_0/source/libnet: .

[mimir at samba.org]

Author: mimir
Date: 2007-09-20 10:23:02 +0000 (Thu, 20 Sep 2007)
New Revision: 25256

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=25256

Log:
Fix missing field set in libnet_ModifyUser routine.

Submitted by Matthias Dieter Wallnoefer <mwallnoefer at yahoo.de>


rafal


Modified:
   branches/SAMBA_4_0/source/libnet/libnet_user.c
   branches/SAMBA_4_0/source/libnet/libnet_user.h


Changeset:
Modified: branches/SAMBA_4_0/source/libnet/libnet_user.c
===================================================================
--- branches/SAMBA_4_0/source/libnet/libnet_user.c	2007-09-20 09:47:18 UTC (rev 25255)
+++ branches/SAMBA_4_0/source/libnet/libnet_user.c	2007-09-20 10:23:02 UTC (rev 25256)
@@ -1,7 +1,7 @@
 /* 
    Unix SMB/CIFS implementation.
    
-   Copyright (C) Rafal Szczesniak <mimir at samba.org> 2005
+   Copyright (C) Rafal Szczesniak  2005
    
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -533,6 +533,9 @@
 	/* account expiry change */
 	SET_FIELD_NTTIME(r->in, user, mod, acct_expiry, USERMOD_FIELD_ACCT_EXPIRY);
 
+	/* account flags change */
+	SET_FIELD_UINT32(r->in, user, mod, acct_flags, USERMOD_FIELD_ACCT_FLAGS);
+
 	return NT_STATUS_OK;
 }
 

Modified: branches/SAMBA_4_0/source/libnet/libnet_user.h
===================================================================
--- branches/SAMBA_4_0/source/libnet/libnet_user.h	2007-09-20 09:47:18 UTC (rev 25255)
+++ branches/SAMBA_4_0/source/libnet/libnet_user.h	2007-09-20 10:23:02 UTC (rev 25256)
@@ -85,7 +85,13 @@
 		} \
 	}
 
+#define SET_FIELD_UINT32(new, current, mod, field, flag) \
+	if (current->field != new.field) { \
+		mod->field = new.field; \
+		mod->fields |= flag; \
+	}
 
+
 struct libnet_UserInfo {
 	struct {
 		const char *user_name;