Changeset 740 for vendor/current/source3/utils/net.h

Timestamp:

Nov 14, 2012, 12:59:34 PM (13 years ago)

Author:

Silvan Scherrer

Message:

Samba Server: update vendor to 3.6.0

File:

• vendor/current/source3/utils/net.h (modified) (5 diffs)

vendor/current/source3/utils/net.h

@@ -23 +23 @@
  */
 
-#include "lib/netapi/netapi.h"
-#include "libnet/libnet.h"
-#include "localedir.h"
+struct cli_state;
 
+#include "../librpc/gen_ndr/lsa.h"
+
+#include "intl.h"
 #ifdef HAVE_LIBINTL_H
 #include <libintl.h>
@@ -76 +77 @@
         int opt_single_obj_repl;
         int opt_clean_old_entries;
+        const char *opt_db;
+        int opt_lock;
+        int opt_auto;
+        int opt_repair;
 
         int opt_have_ip;
@@ -81 +86 @@
         bool smb_encrypt;
         struct libnetapi_ctx *netapi_ctx;
+        struct messaging_context *msg_ctx;
 
         bool display_usage;
@@ -110 +116 @@
 
 typedef NTSTATUS (*rpc_command_fn)(struct net_context *c,
-                                const DOM_SID *,
+                                const struct dom_sid *,
                                 const char *,
                                 struct cli_state *cli,
@@ -130 +136 @@
         struct cli_state *cli;
 
-        DOM_SID *domain_sid;
+        struct dom_sid *domain_sid;
         const char *domain_name;