[SCM] Samba Shared Repository - branch master updated

[Günther Deschner]

The branch, master has been updated
       via  d9f9322... s3-pdbedit: allow to call "pdbedit -N description -u user" without specifiyng "-r".
      from  8d3fc23... s4-dsdb: also mark the relax control non-critical when done

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit d9f93224bdd2b02a8c96667009e43406b47d4c35
Author: Günther Deschner <gd at samba.org>
Date:   Wed Dec 16 15:59:04 2009 +0100

    s3-pdbedit: allow to call "pdbedit -N description -u user" without specifiyng "-r".
    
    Guenther

-----------------------------------------------------------------------

Summary of changes:
 source3/utils/pdbedit.c |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/utils/pdbedit.c b/source3/utils/pdbedit.c
index 5d8a6fd..06eedef 100644
--- a/source3/utils/pdbedit.c
+++ b/source3/utils/pdbedit.c
@@ -50,9 +50,10 @@
 #define BIT_BADPWRESET	0x08000000
 #define BIT_LOGONHOURS	0x10000000
 #define BIT_KICKOFFTIME	0x20000000
+#define BIT_DESCRIPTION 0x40000000
 
 #define MASK_ALWAYS_GOOD	0x0000001F
-#define MASK_USER_GOOD		0x20405FE0
+#define MASK_USER_GOOD		0x60405FE0
 
 static int get_sid_from_cli_string(DOM_SID *sid, const char *str_sid)
 {
@@ -1106,7 +1107,8 @@ int main (int argc, char **argv)
 			(backend_out ? BIT_EXPORT : 0) +
 			(badpw_reset ? BIT_BADPWRESET : 0) +
 			(hours_reset ? BIT_LOGONHOURS : 0) +
-			(kickoff_time ? BIT_KICKOFFTIME : 0);
+			(kickoff_time ? BIT_KICKOFFTIME : 0) +
+			(acct_desc ? BIT_DESCRIPTION : 0);
 
 	if (setparms & BIT_BACKEND) {
 		/* HACK: set the global passdb backend by overwriting globals.


-- 
Samba Shared Repository