[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha7-886-geeddbb6

[Günther Deschner]

The branch, master has been updated
       via  eeddbb6f8466d285fd103a3a4da9ebf5afbcb613 (commit)
       via  557f38326badcd8e1d2338f76c5717e16ae7a7d3 (commit)
      from  21b083a647997549e8188c6fc0687fdecfaa4cb3 (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit eeddbb6f8466d285fd103a3a4da9ebf5afbcb613
Author: Günther Deschner <gd at samba.org>
Date:   Tue Apr 7 01:12:34 2009 +0200

    s3: re-run make samba3-idl.
    
    Guenther

commit 557f38326badcd8e1d2338f76c5717e16ae7a7d3
Author: Günther Deschner <gd at samba.org>
Date:   Tue Apr 7 01:11:44 2009 +0200

    svcctl: Fix svcctl_ControlsAccepted bitmask.
    
    Never ever have 0 value in a bitmask...
    
    pidl should generate at least a warning about those things.
    
    Guenther

-----------------------------------------------------------------------

Summary of changes:
 librpc/gen_ndr/ndr_svcctl.c |    1 -
 librpc/gen_ndr/svcctl.h     |    2 +-
 librpc/idl/svcctl.idl       |    3 ++-
 3 files changed, 3 insertions(+), 3 deletions(-)


Changeset truncated at 500 lines:

diff --git a/librpc/gen_ndr/ndr_svcctl.c b/librpc/gen_ndr/ndr_svcctl.c
index 6101b7d..3dd61b2 100644
--- a/librpc/gen_ndr/ndr_svcctl.c
+++ b/librpc/gen_ndr/ndr_svcctl.c
@@ -120,7 +120,6 @@ _PUBLIC_ void ndr_print_svcctl_ControlsAccepted(struct ndr_print *ndr, const cha
 {
 	ndr_print_uint32(ndr, name, r);
 	ndr->depth++;
-	ndr_print_bitmap_flag(ndr, sizeof(uint32_t), "SVCCTL_ACCEPT_NONE", SVCCTL_ACCEPT_NONE, r);
 	ndr_print_bitmap_flag(ndr, sizeof(uint32_t), "SVCCTL_ACCEPT_STOP", SVCCTL_ACCEPT_STOP, r);
 	ndr_print_bitmap_flag(ndr, sizeof(uint32_t), "SVCCTL_ACCEPT_PAUSE_CONTINUE", SVCCTL_ACCEPT_PAUSE_CONTINUE, r);
 	ndr_print_bitmap_flag(ndr, sizeof(uint32_t), "SVCCTL_ACCEPT_SHUTDOWN", SVCCTL_ACCEPT_SHUTDOWN, r);
diff --git a/librpc/gen_ndr/svcctl.h b/librpc/gen_ndr/svcctl.h
index 6ba0e4f..16d4821 100644
--- a/librpc/gen_ndr/svcctl.h
+++ b/librpc/gen_ndr/svcctl.h
@@ -9,6 +9,7 @@
 #ifndef _HEADER_svcctl
 #define _HEADER_svcctl
 
+#define SVCCTL_ACCEPT_NONE	( 0x00000000 )
 #define SERVICE_TYPE_KERNEL_DRIVER	( 0x01 )
 #define SERVICE_TYPE_FS_DRIVER	( 0x02 )
 #define SERVICE_TYPE_ADAPTER	( 0x04 )
@@ -59,7 +60,6 @@ enum svcctl_ServiceStatus
 ;
 
 /* bitmap svcctl_ControlsAccepted */
-#define SVCCTL_ACCEPT_NONE ( 0x00000000 )
 #define SVCCTL_ACCEPT_STOP ( 0x00000001 )
 #define SVCCTL_ACCEPT_PAUSE_CONTINUE ( 0x00000002 )
 #define SVCCTL_ACCEPT_SHUTDOWN ( 0x00000004 )
diff --git a/librpc/idl/svcctl.idl b/librpc/idl/svcctl.idl
index 3f99029..4b66d9c 100644
--- a/librpc/idl/svcctl.idl
+++ b/librpc/idl/svcctl.idl
@@ -30,8 +30,9 @@ import "misc.idl", "security.idl";
 		SVCCTL_PAUSED			= 0x00000007
 	} svcctl_ServiceStatus;
 
+	const int SVCCTL_ACCEPT_NONE			= 0x00000000;
+
 	typedef [bitmap32bit] bitmap {
-		SVCCTL_ACCEPT_NONE			= 0x00000000,
 		SVCCTL_ACCEPT_STOP			= 0x00000001,
 		SVCCTL_ACCEPT_PAUSE_CONTINUE		= 0x00000002,
 		SVCCTL_ACCEPT_SHUTDOWN			= 0x00000004,


-- 
Samba Shared Repository