r25598: Add missing become_root/unbecome_root around calls of add_aliases.

[samba.git] / source / python / py_samr.h

diff --git a/source/python/py_samr.h b/source/python/py_samr.h
index 326bab5c14df7cf86b11910ef2e7fddaf619a719..78ee803ed1fce4bbbb82e96200869cfc98fdb865 100644 (file)
--- a/source/python/py_samr.h
+++ b/source/python/py_samr.h
@@ -5,7 +5,7 @@
    
    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
-   the Free Software Foundation; either version 2 of the License, or
+   the Free Software Foundation; either version 3 of the License, or
    (at your option) any later version.
    
    This program is distributed in the hope that it will be useful,
@@ -14,43 +14,39 @@
    GNU General Public License for more details.
    
    You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #ifndef _PY_SAMR_H
 #define _PY_SAMR_H
 
-#include "includes.h"
-#include "Python.h"
-
-#include "python/py_common_proto.h"
+#include "python/py_common.h"
 
 /* SAMR connect policy handle object */
 
 typedef struct {
        PyObject_HEAD
-       struct cli_state *cli;
+       struct rpc_pipe_client *cli;
        TALLOC_CTX *mem_ctx;
-       POLICY_HND pol;
+       POLICY_HND connect_pol;
 } samr_connect_hnd_object;
      
 /* SAMR domain policy handle object */
 
 typedef struct {
        PyObject_HEAD
-       struct cli_state *cli;
+       struct rpc_pipe_client *cli;
        TALLOC_CTX *mem_ctx;
-       POLICY_HND pol;
+       POLICY_HND domain_pol;
 } samr_domain_hnd_object;
 
 /* SAMR user policy handle object */
 
 typedef struct {
        PyObject_HEAD
-       struct cli_state *cli;
+       struct rpc_pipe_client *cli;
        TALLOC_CTX *mem_ctx;
-       POLICY_HND pol;
+       POLICY_HND user_pol;
 } samr_user_hnd_object;
 
 /* SAMR group policy handle object */
@@ -59,7 +55,7 @@ typedef struct {
        PyObject_HEAD
        struct cli_state *cli;
        TALLOC_CTX *mem_ctx;
-       POLICY_HND pol;
+       POLICY_HND group_pol;
 } samr_group_hnd_object;
      
 /* SAMR alias policy handle object */
@@ -68,7 +64,7 @@ typedef struct {
        PyObject_HEAD
        struct cli_state *cli;
        TALLOC_CTX *mem_ctx;
-       POLICY_HND pol;
+       POLICY_HND alias_pol;
 } samr_alias_hnd_object;
      
 extern PyTypeObject samr_connect_hnd_type, samr_domain_hnd_type,
@@ -78,6 +74,12 @@ extern PyTypeObject samr_connect_hnd_type, samr_domain_hnd_type,
 
 extern PyObject *samr_error;
 
-// #include "python/py_samr_proto.h"
+/* The following definitions are from py_samr_conv.c */
+
+BOOL py_from_acct_info(PyObject **array, struct acct_info *info, int num_accts);
+BOOL py_from_SAM_USER_INFO_16(PyObject **dict, SAM_USER_INFO_16 *info);
+BOOL py_to_SAM_USER_INFO_16(SAM_USER_INFO_16 *info, PyObject *dict);
+BOOL py_from_SAM_USER_INFO_21(PyObject **dict, SAM_USER_INFO_21 *info);
+BOOL py_to_SAM_USER_INFO_21(SAM_USER_INFO_21 *info, PyObject *dict);
 
 #endif /* _PY_SAMR_H */