The branch, master has been updated
via 8defcb8 Revert "s3:smbd: include smbXsrv.h before smbd/proto.h to
have the smbXsrv_ structs available"
via 0e76bbc Revert "s3:smbd: Include smbXsrv.h before vfs.h (in smbd.h)
so that the smbXsrv structures are available"
via 2cbfdd4 Revert "s3:smb: include "smbXsrv.h" before "vfs.h""
via 205185e s3:smbXsrv.idl: remove smbXsrv_*0 defines
via 2b41f37 s3:param: fix compiler warnings with
FN_GLOBAL_CONST_STRING()
from 13f8674 build: rename security → samba-security
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 8defcb8bd1292376c2c00f1d432fe751c207f872
Author: Stefan Metzmacher <me...@samba.org>
Date: Fri Aug 10 11:58:39 2012 +0200
Revert "s3:smbd: include smbXsrv.h before smbd/proto.h to have the smbXsrv_
structs available"
This reverts commit 98ccca8dca70b87d04a93c8ef5232a071ab7c2af.
Autobuild-User(master): Stefan Metzmacher <me...@samba.org>
Autobuild-Date(master): Fri Aug 10 17:35:38 CEST 2012 on sn-devel-104
commit 0e76bbc520b0052f1fed6bbd17fe8737249e8e68
Author: Stefan Metzmacher <me...@samba.org>
Date: Fri Aug 10 11:56:21 2012 +0200
Revert "s3:smbd: Include smbXsrv.h before vfs.h (in smbd.h) so that the
smbXsrv structures are available"
This reverts commit e332bfaff51e54638bd37cd1fe08e57608e16e86.
commit 2cbfdd433e208a53bc8d8b959fbe23303fc60492
Author: Stefan Metzmacher <me...@samba.org>
Date: Fri Aug 10 11:58:28 2012 +0200
Revert "s3:smb: include "smbXsrv.h" before "vfs.h""
This reverts commit db0c233624e633b3cc1a6e0e44dccc09aaa121f2.
commit 205185e88c8724e672675f893b386a57f2b8547d
Author: Stefan Metzmacher <me...@samba.org>
Date: Fri Aug 10 11:55:13 2012 +0200
s3:smbXsrv.idl: remove smbXsrv_*0 defines
This makes ctags more usable.
metze
commit 2b41f3702fd7f46696bf6eaf96ad1a58b797ec07
Author: Stefan Metzmacher <me...@samba.org>
Date: Fri Aug 10 12:05:15 2012 +0200
s3:param: fix compiler warnings with FN_GLOBAL_CONST_STRING()
metze
-----------------------------------------------------------------------
Summary of changes:
source3/include/smb.h | 6 ---
source3/librpc/idl/smbXsrv.idl | 84 ++++++++++++++++++++--------------------
source3/param/loadparm.c | 2 +-
source3/smbd/smbd.h | 1 -
4 files changed, 43 insertions(+), 50 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/include/smb.h b/source3/include/smb.h
index c6e6fb3..2aa2ab3 100644
--- a/source3/include/smb.h
+++ b/source3/include/smb.h
@@ -154,12 +154,6 @@ struct sys_notify_context {
/* Include VFS stuff */
#include "smb_acls.h"
-/*
- * smbXsrv.h: currently needed for vfs.h, as long as
- * the smbXsrv structures are still referenced as a
- * backling from files_struct and connection_struct.
- */
-#include "librpc/gen_ndr/smbXsrv.h"
#include "vfs.h"
struct current_user {
diff --git a/source3/librpc/idl/smbXsrv.idl b/source3/librpc/idl/smbXsrv.idl
index 9111b3d..b3f2250 100644
--- a/source3/librpc/idl/smbXsrv.idl
+++ b/source3/librpc/idl/smbXsrv.idl
@@ -4,42 +4,6 @@ import "server_id.idl";
import "security.idl";
import "auth.idl";
-/*
- * The main server code should just work with
- * 'struct smbXsrv_session' and never use
- * smbXsrv_session0, smbXsrv_sessionU
- * and smbXsrv_sessionB directly.
- *
- * If we need to change the smbXsrv_session,
- * we can just point it to smbXsrv_session1
- * and could implement transparent mapping.
- */
-cpp_quote("#define smbXsrv_session smbXsrv_session0")
-
-/*
- * The main server code should just work with
- * 'struct smbXsrv_tcon' and never use
- * smbXsrv_tcon0, smbXsrv_tconU
- * and smbXsrv_tconB directly.
- *
- * If we need to change the smbXsrv_tcon,
- * we can just point it to smbXsrv_tcon1
- * and could implement transparent mapping.
- */
-cpp_quote("#define smbXsrv_tcon smbXsrv_tcon0")
-
-/*
- * The main server code should just work with
- * 'struct smbXsrv_open' and never use
- * smbXsrv_open0, smbXsrv_openU
- * and smbXsrv_openB directly.
- *
- * If we need to change the smbXsrv_open,
- * we can just point it to smbXsrv_open1
- * and could implement transparent mapping.
- */
-cpp_quote("#define smbXsrv_open smbXsrv_open0")
-
[
uuid("07408340-ae31-11e1-97dc-539f7fddc06f"),
version(0.0),
@@ -161,6 +125,18 @@ interface smbXsrv
[in] smbXsrv_session_globalB blob
);
+ /*
+ * The main server code should just work with
+ * 'struct smbXsrv_session' and never use
+ * smbXsrv_session0, smbXsrv_sessionU
+ * and smbXsrv_sessionB directly.
+ *
+ * If we need to change the smbXsrv_session,
+ * we can just rename smbXsrv_session
+ * to smbXsrv_session0 and add a new
+ * smbXsrv_session for version 1
+ * and could implement transparent mapping.
+ */
typedef struct {
[ignore] smbXsrv_session_table *table;
[ignore] db_record *db_rec;
@@ -172,10 +148,10 @@ interface smbXsrv
[ignore] gensec_security *gensec;
[ignore] user_struct *compat;
[ignore] smbXsrv_tcon_table *tcon_table;
- } smbXsrv_session0;
+ } smbXsrv_session;
typedef union {
- [case(0)] smbXsrv_session0 *info0;
+ [case(0)] smbXsrv_session *info0;
[default] hyper *dummy;
} smbXsrv_sessionU;
@@ -242,6 +218,18 @@ interface smbXsrv
[in] smbXsrv_tcon_globalB blob
);
+ /*
+ * The main server code should just work with
+ * 'struct smbXsrv_tcon' and never use
+ * smbXsrv_tcon0, smbXsrv_tconU
+ * and smbXsrv_tconB directly.
+ *
+ * If we need to change the smbXsrv_tcon,
+ * we can just rename smbXsrv_tcon
+ * to smbXsrv_tcon0 and add a new
+ * smbXsrv_tcon for version 1
+ * and could implement transparent mapping.
+ */
typedef struct {
[ignore] smbXsrv_tcon_table *table;
[ignore] db_record *db_rec;
@@ -250,10 +238,10 @@ interface smbXsrv
NTSTATUS status;
NTTIME idle_time;
[ignore] connection_struct *compat;
- } smbXsrv_tcon0;
+ } smbXsrv_tcon;
typedef union {
- [case(0)] smbXsrv_tcon0 *info0;
+ [case(0)] smbXsrv_tcon *info0;
[default] hyper *dummy;
} smbXsrv_tconU;
@@ -301,6 +289,18 @@ interface smbXsrv
[in] smbXsrv_open_globalB blob
);
+ /*
+ * The main server code should just work with
+ * 'struct smbXsrv_open' and never use
+ * smbXsrv_open0, smbXsrv_openU
+ * and smbXsrv_openB directly.
+ *
+ * If we need to change the smbXsrv_open,
+ * we can just rename smbXsrv_open
+ * to smbXsrv_open0 and add a new
+ * smbXsrv_open for version 1
+ * and could implement transparent mapping.
+ */
typedef struct {
[ignore] smbXsrv_open_table *table;
[ignore] db_record *db_rec;
@@ -309,10 +309,10 @@ interface smbXsrv
NTSTATUS status;
NTTIME idle_time;
[ignore] files_struct *compat;
- } smbXsrv_open0;
+ } smbXsrv_open;
typedef union {
- [case(0)] smbXsrv_open0 *info0;
+ [case(0)] smbXsrv_open *info0;
[default] hyper *dummy;
} smbXsrv_openU;
diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c
index 5dcb926..d7141ae 100644
--- a/source3/param/loadparm.c
+++ b/source3/param/loadparm.c
@@ -1101,7 +1101,7 @@ static char *lp_string(TALLOC_CTX *ctx, const char *s)
#define FN_GLOBAL_STRING(fn_name,ptr) \
char *lp_ ## fn_name(TALLOC_CTX *ctx) {return(lp_string((ctx), *(char
**)(&Globals.ptr) ? *(char **)(&Globals.ptr) : ""));}
#define FN_GLOBAL_CONST_STRING(fn_name,ptr) \
- const char *lp_ ## fn_name(void) {return(*(const char **)(&Globals.ptr) ?
*(const char **)(&Globals.ptr) : "");}
+ const char *lp_ ## fn_name(void) {return(*(const char * const
*)(&Globals.ptr) ? *(const char * const *)(&Globals.ptr) : "");}
#define FN_GLOBAL_LIST(fn_name,ptr) \
const char **lp_ ## fn_name(void) {return(*(const char ***)(&Globals.ptr));}
#define FN_GLOBAL_BOOL(fn_name,ptr) \
diff --git a/source3/smbd/smbd.h b/source3/smbd/smbd.h
index 009b183..a5b211a 100644
--- a/source3/smbd/smbd.h
+++ b/source3/smbd/smbd.h
@@ -22,7 +22,6 @@
struct dptr_struct;
#include "smb_acls.h"
-#include "librpc/gen_ndr/smbXsrv.h"
#include "vfs.h"
#include "smbd/proto.h"
#include "locking/proto.h"
--
Samba Shared Repository
