The branch, v3-devel has been updated
via 5851b4e40e5cc2b7ba973b274f9203aa6e6fb1d8 (commit)
via 86de3242a478c9f669958414ee9e7720cddad9aa (commit)
via f87caa7bff3b8a0b8d7cdc5cda7d21dd7e9eb0ec (commit)
via c5ab5bf8417412835d879c8a58a7c64e1359646f (commit)
via 383d268f8c4f6282757d350e6b059446e52e6c53 (commit)
via 9afc888356f801fd231234673bb4a1f6cbf62792 (commit)
from afdd14c26c27c9fa245165985a5d8e644855c4b5 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-devel
- Log -----------------------------------------------------------------
commit 5851b4e40e5cc2b7ba973b274f9203aa6e6fb1d8
Author: Günther Deschner <[EMAIL PROTECTED]>
Date: Tue Sep 2 14:35:58 2008 +0200
netapi: remove NetSetup* flags from netdomjoin-gui.
Guenther
commit 86de3242a478c9f669958414ee9e7720cddad9aa
Author: Günther Deschner <[EMAIL PROTECTED]>
Date: Tue Sep 2 14:34:58 2008 +0200
netapi: add NETSETUP_JOIN_STATUS to public header.
Guenther
commit f87caa7bff3b8a0b8d7cdc5cda7d21dd7e9eb0ec
Author: Günther Deschner <[EMAIL PROTECTED]>
Date: Tue Sep 2 14:33:21 2008 +0200
re-run make idl.
Guenther
commit c5ab5bf8417412835d879c8a58a7c64e1359646f
Author: Günther Deschner <[EMAIL PROTECTED]>
Date: Tue Sep 2 14:32:59 2008 +0200
netapi: add NETSETUP_JOIN_STATUS to IDL.
Guenther
commit 383d268f8c4f6282757d350e6b059446e52e6c53
Author: Günther Deschner <[EMAIL PROTECTED]>
Date: Tue Sep 2 14:32:41 2008 +0200
re-run make idl.
Guenther
commit 9afc888356f801fd231234673bb4a1f6cbf62792
Author: Günther Deschner <[EMAIL PROTECTED]>
Date: Tue Sep 2 14:32:16 2008 +0200
wkssvc: rename wkssvc_NetJoinStatus flags.
Guenther
-----------------------------------------------------------------------
Summary of changes:
.../examples/netdomjoin-gui/netdomjoin-gui.c | 3 ---
source/lib/netapi/netapi.h | 7 +++++++
source/librpc/gen_ndr/libnetapi.h | 17 +++++++++++++++++
source/librpc/gen_ndr/ndr_wkssvc.c | 8 ++++----
source/librpc/gen_ndr/wkssvc.h | 16 ++++++++--------
source/librpc/idl/libnetapi.idl | 7 +++++++
source/librpc/idl/wkssvc.idl | 8 ++++----
7 files changed, 47 insertions(+), 19 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source/lib/netapi/examples/netdomjoin-gui/netdomjoin-gui.c
b/source/lib/netapi/examples/netdomjoin-gui/netdomjoin-gui.c
index 98994b6..40a6e41 100644
--- a/source/lib/netapi/examples/netdomjoin-gui/netdomjoin-gui.c
+++ b/source/lib/netapi/examples/netdomjoin-gui/netdomjoin-gui.c
@@ -38,9 +38,6 @@
#define SAMBA_IMAGE_PATH "/usr/share/pixmaps/samba/logo.png"
#define SAMBA_IMAGE_PATH_SMALL "/usr/share/pixmaps/samba/logo-small.png"
-#define NetSetupWorkgroupName ( 2 )
-#define NetSetupDomainName ( 3 )
-
#define SAFE_FREE(x) do { if ((x) != NULL) {free(x); x=NULL;} } while(0)
static gboolean verbose = FALSE;
diff --git a/source/lib/netapi/netapi.h b/source/lib/netapi/netapi.h
index ba509f8..8f1ec84 100644
--- a/source/lib/netapi/netapi.h
+++ b/source/lib/netapi/netapi.h
@@ -97,6 +97,13 @@ struct DOMAIN_CONTROLLER_INFO {
#define TIMEQ_FOREVER ( (uint32_t)-1L )
+enum NETSETUP_JOIN_STATUS {
+ NetSetupUnknownStatus=0,
+ NetSetupUnjoined=1,
+ NetSetupWorkgroupName=2,
+ NetSetupDomainName=3
+};
+
struct SERVER_INFO_100 {
uint32_t sv100_platform_id;
const char * sv100_name;
diff --git a/source/librpc/gen_ndr/libnetapi.h
b/source/librpc/gen_ndr/libnetapi.h
index b51cd3f..2d659b9 100644
--- a/source/librpc/gen_ndr/libnetapi.h
+++ b/source/librpc/gen_ndr/libnetapi.h
@@ -58,6 +58,23 @@ struct domsid {
#define NETSETUP_INSTALL_INVOCATION ( 0x00040000 )
#define NETSETUP_IGNORE_UNSUPPORTED_FLAGS ( 0x10000000 )
+enum NETSETUP_JOIN_STATUS
+#ifndef USE_UINT_ENUMS
+ {
+ NetSetupUnknownStatus=0,
+ NetSetupUnjoined=1,
+ NetSetupWorkgroupName=2,
+ NetSetupDomainName=3
+}
+#else
+ { __donnot_use_enum_NETSETUP_JOIN_STATUS=0x7FFFFFFF}
+#define NetSetupUnknownStatus ( 0 )
+#define NetSetupUnjoined ( 1 )
+#define NetSetupWorkgroupName ( 2 )
+#define NetSetupDomainName ( 3 )
+#endif
+;
+
struct SERVER_INFO_100 {
uint32_t sv100_platform_id;
const char * sv100_name;
diff --git a/source/librpc/gen_ndr/ndr_wkssvc.c
b/source/librpc/gen_ndr/ndr_wkssvc.c
index 10e5e55..e494f08 100644
--- a/source/librpc/gen_ndr/ndr_wkssvc.c
+++ b/source/librpc/gen_ndr/ndr_wkssvc.c
@@ -5474,10 +5474,10 @@ _PUBLIC_ void ndr_print_wkssvc_NetJoinStatus(struct
ndr_print *ndr, const char *
const char *val = NULL;
switch (r) {
- case NetSetupUnknownStatus: val = "NetSetupUnknownStatus";
break;
- case NetSetupUnjoined: val = "NetSetupUnjoined"; break;
- case NetSetupWorkgroupName: val = "NetSetupWorkgroupName";
break;
- case NetSetupDomainName: val = "NetSetupDomainName"; break;
+ case NET_SETUP_UNKNOWN_STATUS: val =
"NET_SETUP_UNKNOWN_STATUS"; break;
+ case NET_SETUP_UNJOINED: val = "NET_SETUP_UNJOINED"; break;
+ case NET_SETUP_WORKGROUP_NAME: val =
"NET_SETUP_WORKGROUP_NAME"; break;
+ case NET_SETUP_DOMAIN_NAME: val = "NET_SETUP_DOMAIN_NAME";
break;
}
ndr_print_enum(ndr, name, "ENUM", val, r);
}
diff --git a/source/librpc/gen_ndr/wkssvc.h b/source/librpc/gen_ndr/wkssvc.h
index 088ad66..07b4c40 100644
--- a/source/librpc/gen_ndr/wkssvc.h
+++ b/source/librpc/gen_ndr/wkssvc.h
@@ -439,17 +439,17 @@ enum wkssvc_NetValidateNameType
enum wkssvc_NetJoinStatus
#ifndef USE_UINT_ENUMS
{
- NetSetupUnknownStatus=0,
- NetSetupUnjoined=1,
- NetSetupWorkgroupName=2,
- NetSetupDomainName=3
+ NET_SETUP_UNKNOWN_STATUS=0,
+ NET_SETUP_UNJOINED=1,
+ NET_SETUP_WORKGROUP_NAME=2,
+ NET_SETUP_DOMAIN_NAME=3
}
#else
{ __donnot_use_enum_wkssvc_NetJoinStatus=0x7FFFFFFF}
-#define NetSetupUnknownStatus ( 0 )
-#define NetSetupUnjoined ( 1 )
-#define NetSetupWorkgroupName ( 2 )
-#define NetSetupDomainName ( 3 )
+#define NET_SETUP_UNKNOWN_STATUS ( 0 )
+#define NET_SETUP_UNJOINED ( 1 )
+#define NET_SETUP_WORKGROUP_NAME ( 2 )
+#define NET_SETUP_DOMAIN_NAME ( 3 )
#endif
;
diff --git a/source/librpc/idl/libnetapi.idl b/source/librpc/idl/libnetapi.idl
index acd0e57..b2c79fc 100644
--- a/source/librpc/idl/libnetapi.idl
+++ b/source/librpc/idl/libnetapi.idl
@@ -68,6 +68,13 @@ interface libnetapi
/* NetGetJoinInformation */
/*******************************************/
+ typedef enum {
+ NetSetupUnknownStatus = 0,
+ NetSetupUnjoined = 1,
+ NetSetupWorkgroupName = 2,
+ NetSetupDomainName = 3
+ } NETSETUP_JOIN_STATUS;
+
[nopush,nopull] NET_API_STATUS NetGetJoinInformation(
[in,unique] string *server_name,
[out] string **name_buffer,
diff --git a/source/librpc/idl/wkssvc.idl b/source/librpc/idl/wkssvc.idl
index 023ce59..9340990 100644
--- a/source/librpc/idl/wkssvc.idl
+++ b/source/librpc/idl/wkssvc.idl
@@ -627,10 +627,10 @@ import "srvsvc.idl", "lsa.idl";
/*****************************/
/* Function 0x14 */
typedef enum {
- NetSetupUnknownStatus = 0,
- NetSetupUnjoined = 1,
- NetSetupWorkgroupName = 2,
- NetSetupDomainName = 3
+ NET_SETUP_UNKNOWN_STATUS = 0,
+ NET_SETUP_UNJOINED = 1,
+ NET_SETUP_WORKGROUP_NAME = 2,
+ NET_SETUP_DOMAIN_NAME = 3
} wkssvc_NetJoinStatus;
WERROR wkssvc_NetrGetJoinInformation(
--
Samba Shared Repository
