Add a setexpiry operation in samdb.py

This makes it easy to set the expiry (or no expiry) for a samdb user
(This used to be commit 25171f18a4b242b5a731f4ac1eefc51cc82efd74)

2 files changed, 28 insertions, 23 deletions

diff --git a/source4/lib/registry/registry.py b/source4/lib/registry/registry.py
index 0aeefb86c1..e086a6ad37 100644
--- a/source4/lib/registry/registry.py
+++ b/source4/lib/registry/registry.py
@@ -1,5 +1,5 @@
 # This file was automatically generated by SWIG (http://www.swig.org).
-# Version 1.3.35
+# Version 1.3.36
 #
 # Don't modify this file, modify the SWIG interface instead.
 
diff --git a/source4/lib/registry/registry_wrap.c b/source4/lib/registry/registry_wrap.c
index 3fc34b1fe3..809610fd1d 100644
--- a/source4/lib/registry/registry_wrap.c
+++ b/source4/lib/registry/registry_wrap.c
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.35
+ * Version 1.3.36
  * 
  * This file is not intended to be easily readable and contains a number of 
  * coding conventions designed to improve portability and efficiency. Do not make
@@ -52,6 +52,12 @@
 # endif
 #endif
 
+#ifndef SWIG_MSC_UNSUPPRESS_4505
+# if defined(_MSC_VER)
+#   pragma warning(disable : 4505) /* unreferenced local function has been removed */
+# endif 
+#endif
+
 #ifndef SWIGUNUSEDPARM
 # ifdef __cplusplus
 #   define SWIGUNUSEDPARM(p)
@@ -2533,7 +2539,7 @@ static swig_module_info swig_module = {swig_types, 26, 0, 0, 0, 0};
 
 #define SWIG_name    "_registry"
 
-#define SWIGVERSION 0x010335 
+#define SWIGVERSION 0x010336 
 #define SWIG_VERSION SWIGVERSION
 
 
@@ -2886,13 +2892,13 @@ extern "C" {
 SWIGINTERN PyObject *_wrap_reg_get_predef_name(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
   PyObject *resultobj = 0;
   uint32_t arg1 ;
-  char *result = 0 ;
   unsigned int val1 ;
   int ecode1 = 0 ;
   PyObject * obj0 = 0 ;
   char *  kwnames[] = {
     (char *) "hkey", NULL 
   };
+  char *result = 0 ;
   
   if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:reg_get_predef_name",kwnames,&obj0)) SWIG_fail;
   ecode1 = SWIG_AsVal_unsigned_SS_int(obj0, &val1);
@@ -2911,13 +2917,13 @@ fail:
 SWIGINTERN PyObject *_wrap_str_regtype(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
   PyObject *resultobj = 0;
   int arg1 ;
-  char *result = 0 ;
   int val1 ;
   int ecode1 = 0 ;
   PyObject * obj0 = 0 ;
   char *  kwnames[] = {
     (char *) "type", NULL 
   };
+  char *result = 0 ;
   
   if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:str_regtype",kwnames,&obj0)) SWIG_fail;
   ecode1 = SWIG_AsVal_int(obj0, &val1);
@@ -2937,8 +2943,8 @@ SWIGINTERN PyObject *_wrap_Registry(PyObject *SWIGUNUSEDPARM(self), PyObject *ar
   PyObject *resultobj = 0;
   TALLOC_CTX *arg1 = (TALLOC_CTX *) 0 ;
   struct registry_context **arg2 = (struct registry_context **) 0 ;
-  WERROR result;
   struct registry_context *tmp2 ;
+  WERROR result;
   
   arg1 = NULL;
   arg2 = &tmp2;
@@ -2962,7 +2968,6 @@ SWIGINTERN PyObject *_wrap_reg_get_predefined_key_by_name(PyObject *SWIGUNUSEDPA
   reg *arg1 = (reg *) 0 ;
   char *arg2 = (char *) 0 ;
   struct registry_key **arg3 = (struct registry_key **) 0 ;
-  WERROR result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   int res2 ;
@@ -2976,6 +2981,7 @@ SWIGINTERN PyObject *_wrap_reg_get_predefined_key_by_name(PyObject *SWIGUNUSEDPA
   char *  kwnames[] = {
     (char *) "self",(char *) "name",(char *) "key", NULL 
   };
+  WERROR result;
   
   if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:reg_get_predefined_key_by_name",kwnames,&obj0,&obj1,&obj2)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_registry_context, 0 |  0 );
@@ -3012,7 +3018,6 @@ SWIGINTERN PyObject *_wrap_reg_key_del_abs(PyObject *SWIGUNUSEDPARM(self), PyObj
   PyObject *resultobj = 0;
   reg *arg1 = (reg *) 0 ;
   char *arg2 = (char *) 0 ;
-  WERROR result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   int res2 ;
@@ -3023,6 +3028,7 @@ SWIGINTERN PyObject *_wrap_reg_key_del_abs(PyObject *SWIGUNUSEDPARM(self), PyObj
   char *  kwnames[] = {
     (char *) "self",(char *) "path", NULL 
   };
+  WERROR result;
   
   if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:reg_key_del_abs",kwnames,&obj0,&obj1)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_registry_context, 0 |  0 );
@@ -3055,7 +3061,6 @@ SWIGINTERN PyObject *_wrap_reg_get_predefined_key(PyObject *SWIGUNUSEDPARM(self)
   reg *arg1 = (reg *) 0 ;
   uint32_t arg2 ;
   struct registry_key **arg3 = (struct registry_key **) 0 ;
-  WERROR result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   unsigned int val2 ;
@@ -3068,6 +3073,7 @@ SWIGINTERN PyObject *_wrap_reg_get_predefined_key(PyObject *SWIGUNUSEDPARM(self)
   char *  kwnames[] = {
     (char *) "self",(char *) "hkey_id",(char *) "key", NULL 
   };
+  WERROR result;
   
   if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:reg_get_predefined_key",kwnames,&obj0,&obj1,&obj2)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_registry_context, 0 |  0 );
@@ -3102,7 +3108,6 @@ SWIGINTERN PyObject *_wrap_reg_diff_apply(PyObject *SWIGUNUSEDPARM(self), PyObje
   PyObject *resultobj = 0;
   reg *arg1 = (reg *) 0 ;
   char *arg2 = (char *) 0 ;
-  WERROR result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   int res2 ;
@@ -3113,6 +3118,7 @@ SWIGINTERN PyObject *_wrap_reg_diff_apply(PyObject *SWIGUNUSEDPARM(self), PyObje
   char *  kwnames[] = {
     (char *) "self",(char *) "filename", NULL 
   };
+  WERROR result;
   
   if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:reg_diff_apply",kwnames,&obj0,&obj1)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_registry_context, 0 |  0 );
@@ -3146,7 +3152,6 @@ SWIGINTERN PyObject *_wrap_reg_generate_diff(PyObject *SWIGUNUSEDPARM(self), PyO
   struct registry_context *arg2 = (struct registry_context *) 0 ;
   struct reg_diff_callbacks *arg3 = (struct reg_diff_callbacks *) 0 ;
   void *arg4 = (void *) 0 ;
-  WERROR result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
@@ -3161,6 +3166,7 @@ SWIGINTERN PyObject *_wrap_reg_generate_diff(PyObject *SWIGUNUSEDPARM(self), PyO
   char *  kwnames[] = {
     (char *) "self",(char *) "ctx2",(char *) "callbacks",(char *) "callback_data", NULL 
   };
+  WERROR result;
   
   if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:reg_generate_diff",kwnames,&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_registry_context, 0 |  0 );
@@ -3201,13 +3207,13 @@ SWIGINTERN PyObject *_wrap_reg_mount_hive__SWIG_0(PyObject *SWIGUNUSEDPARM(self)
   struct hive_key *arg2 = (struct hive_key *) 0 ;
   uint32_t arg3 ;
   char **arg4 = (char **) NULL ;
-  WERROR result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
   unsigned int val3 ;
   int ecode3 = 0 ;
+  WERROR result;
   
   if ((nobjs < 3) || (nobjs > 4)) SWIG_fail;
   res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_registry_context, 0 |  0 );
@@ -3268,7 +3274,6 @@ SWIGINTERN PyObject *_wrap_reg_import_hive_key(PyObject *SWIGUNUSEDPARM(self), P
   struct hive_key *arg2 = (struct hive_key *) 0 ;
   uint32_t arg3 ;
   char **arg4 = (char **) 0 ;
-  struct registry_key *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
@@ -3282,6 +3287,7 @@ SWIGINTERN PyObject *_wrap_reg_import_hive_key(PyObject *SWIGUNUSEDPARM(self), P
   char *  kwnames[] = {
     (char *) "self",(char *) "hive",(char *) "predef_key",(char *) "elements", NULL 
   };
+  struct registry_key *result = 0 ;
   
   if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:reg_import_hive_key",kwnames,&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_registry_context, 0 |  0 );
@@ -3334,7 +3340,6 @@ SWIGINTERN PyObject *_wrap_reg_mount_hive__SWIG_1(PyObject *SWIGUNUSEDPARM(self)
   reg *arg1 = (reg *) 0 ;
   struct hive_key *arg2 = (struct hive_key *) 0 ;
   char *arg3 = (char *) 0 ;
-  WERROR result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
@@ -3342,6 +3347,7 @@ SWIGINTERN PyObject *_wrap_reg_mount_hive__SWIG_1(PyObject *SWIGUNUSEDPARM(self)
   int res3 ;
   char *buf3 = 0 ;
   int alloc3 = 0 ;
+  WERROR result;
   
   if ((nobjs < 3) || (nobjs > 3)) SWIG_fail;
   res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_registry_context, 0 |  0 );
@@ -3434,7 +3440,6 @@ SWIGINTERN PyObject *_wrap_delete_reg(PyObject *SWIGUNUSEDPARM(self), PyObject *
   }
   arg1 = (reg *)(argp1);
   free((char *) arg1);
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -3462,7 +3467,6 @@ SWIGINTERN PyObject *_wrap_hive_key(PyObject *SWIGUNUSEDPARM(self), PyObject *ar
   struct event_context *arg5 = (struct event_context *) 0 ;
   struct loadparm_context *arg6 = (struct loadparm_context *) 0 ;
   struct hive_key **arg7 = (struct hive_key **) 0 ;
-  WERROR result;
   int res2 ;
   char *buf2 = 0 ;
   int alloc2 = 0 ;
@@ -3483,10 +3487,11 @@ SWIGINTERN PyObject *_wrap_hive_key(PyObject *SWIGUNUSEDPARM(self), PyObject *ar
   char *  kwnames[] = {
     (char *) "location",(char *) "session_info",(char *) "credentials",(char *) "ev_ctx",(char *) "lp_ctx", NULL 
   };
+  WERROR result;
   
   arg3 = NULL;
   arg4 = NULL;
-  arg5 = s4_event_context_init(NULL);
+  arg5 = event_context_init(NULL);
   arg6 = loadparm_init(NULL);
   arg1 = NULL;
   arg7 = &tmp7;
@@ -3550,7 +3555,6 @@ SWIGINTERN PyObject *_wrap_open_ldb(PyObject *SWIGUNUSEDPARM(self), PyObject *ar
   struct event_context *arg5 = (struct event_context *) 0 ;
   struct loadparm_context *arg6 = (struct loadparm_context *) 0 ;
   struct hive_key **arg7 = (struct hive_key **) 0 ;
-  WERROR result;
   int res2 ;
   char *buf2 = 0 ;
   int alloc2 = 0 ;
@@ -3571,10 +3575,11 @@ SWIGINTERN PyObject *_wrap_open_ldb(PyObject *SWIGUNUSEDPARM(self), PyObject *ar
   char *  kwnames[] = {
     (char *) "location",(char *) "session_info",(char *) "credentials",(char *) "ev_ctx",(char *) "lp_ctx", NULL 
   };
+  WERROR result;
   
   arg3 = NULL;
   arg4 = NULL;
-  arg5 = s4_event_context_init(NULL);
+  arg5 = event_context_init(NULL);
   arg6 = loadparm_init(NULL);
   arg1 = NULL;
   arg7 = &tmp7;
@@ -3634,7 +3639,6 @@ SWIGINTERN PyObject *_wrap_create_dir(PyObject *SWIGUNUSEDPARM(self), PyObject *
   TALLOC_CTX *arg1 = (TALLOC_CTX *) 0 ;
   char *arg2 = (char *) 0 ;
   struct hive_key **arg3 = (struct hive_key **) 0 ;
-  WERROR result;
   int res2 ;
   char *buf2 = 0 ;
   int alloc2 = 0 ;
@@ -3643,6 +3647,7 @@ SWIGINTERN PyObject *_wrap_create_dir(PyObject *SWIGUNUSEDPARM(self), PyObject *
   char *  kwnames[] = {
     (char *) "location", NULL 
   };
+  WERROR result;
   
   arg1 = NULL;
   arg3 = &tmp3;
@@ -3674,7 +3679,6 @@ SWIGINTERN PyObject *_wrap_open_dir(PyObject *SWIGUNUSEDPARM(self), PyObject *ar
   TALLOC_CTX *arg1 = (TALLOC_CTX *) 0 ;
   char *arg2 = (char *) 0 ;
   struct hive_key **arg3 = (struct hive_key **) 0 ;
-  WERROR result;
   int res2 ;
   char *buf2 = 0 ;
   int alloc2 = 0 ;
@@ -3683,6 +3687,7 @@ SWIGINTERN PyObject *_wrap_open_dir(PyObject *SWIGUNUSEDPARM(self), PyObject *ar
   char *  kwnames[] = {
     (char *) "location", NULL 
   };
+  WERROR result;
   
   arg1 = NULL;
   arg3 = &tmp3;
@@ -3717,7 +3722,6 @@ SWIGINTERN PyObject *_wrap_open_samba(PyObject *SWIGUNUSEDPARM(self), PyObject *
   struct loadparm_context *arg4 = (struct loadparm_context *) 0 ;
   struct auth_session_info *arg5 = (struct auth_session_info *) 0 ;
   struct cli_credentials *arg6 = (struct cli_credentials *) 0 ;
-  WERROR result;
   struct registry_context *tmp2 ;
   void *argp3 = 0 ;
   int res3 = 0 ;
@@ -3734,8 +3738,9 @@ SWIGINTERN PyObject *_wrap_open_samba(PyObject *SWIGUNUSEDPARM(self), PyObject *
   char *  kwnames[] = {
     (char *) "ev_ctx",(char *) "lp_ctx",(char *) "session_info",(char *) "credentials", NULL 
   };
+  WERROR result;
   
-  arg3 = s4_event_context_init(NULL);
+  arg3 = event_context_init(NULL);
   arg4 = loadparm_init(NULL);
   arg5 = NULL;
   arg6 = NULL;