[GLUE] Rsync SAMBA_3_2_0 SVN r25598 in order to create the v3-2-test branch.

[samba.git] / source / utils / net.h

diff --git a/source/utils/net.h b/source/utils/net.h
index fc3167012d6d41d011ba5a3ddc82077ac4effb8b..795cc4d71a7f1bf63eb7ffd60d3a4818e0b2e86d 100644 (file)
--- a/source/utils/net.h
+++ b/source/utils/net.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,8 +14,7 @@
    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/>.  */
 
 /* 
  * A function of this type is passed to the '
@@ -62,30 +61,23 @@ struct rpc_sh_cmd {
        const char *help;
 };
 
+enum netdom_domain_t { ND_TYPE_NT4, ND_TYPE_AD };
+
 /* INCLUDE FILES */
 
 #include "utils/net_proto.h"
  
 /* MACROS & DEFINES */
 
-#define NET_FLAGS_MASTER 1
-#define NET_FLAGS_DMB 2
-
-/* Would it be insane to set 'localhost' as the default
-   remote host for this operation? 
-
-   For example, localhost is insane for a 'join' operation.
-*/
-#define NET_FLAGS_LOCALHOST_DEFAULT_INSANE 4 
-
-/* We want to find the PDC only */
-#define NET_FLAGS_PDC 8 
-
-/* We want an anonymous connection */
-#define NET_FLAGS_ANONYMOUS 16 
-
-/* don't open an RPC pipe */
-#define NET_FLAGS_NO_PIPE 32
+#define NET_FLAGS_MASTER                       0x00000001
+#define NET_FLAGS_DMB                          0x00000002
+#define NET_FLAGS_LOCALHOST_DEFAULT_INSANE     0x00000004      /* Would it be insane to set 'localhost'
+                                                                  as the default remote host for this
+                                                                  operation?  For example, localhost
+                                                                  is insane for a 'join' operation.  */
+#define NET_FLAGS_PDC                          0x00000008      /* PDC only */ 
+#define NET_FLAGS_ANONYMOUS                    0x00000010      /* use an anonymous connection */
+#define NET_FLAGS_NO_PIPE                      0x00000020      /* don't open an RPC pipe */
 
 /* net share operation modes */
 #define NET_MODE_SHARE_MIGRATE 1
@@ -119,6 +111,7 @@ extern int opt_attrs;
 extern int opt_timestamps;
 extern const char *opt_exclude;
 extern const char *opt_destination;
+extern BOOL opt_testmode;
 
 extern BOOL opt_have_ip;
 extern struct in_addr opt_dest_ip;