[SCM] Samba Shared Repository - branch master updated

Stefan Metzmacher metze at samba.org
Tue Jul 12 10:57:03 MDT 2011


The branch, master has been updated
       via  b807c58 s3: dbwrap_ctdb.c: fix #ifdef CTDB_CONTROL_SCHEDULE_FOR_DELETION issue (bug #8303)
       via  ee76239 s4:libcli/raw: s/SMBchkpth/SMBcheckpath
      from  110bf31 s4:winsdb: place wins.ldb in "state dir" instead of "lock dir"

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


- Log -----------------------------------------------------------------
commit b807c58b655f1ffbf849f5de9eef66136bdb4a52
Author: Björn Baumbach <bb at sernet.de>
Date:   Tue Jul 12 17:32:55 2011 +0200

    s3: dbwrap_ctdb.c: fix #ifdef CTDB_CONTROL_SCHEDULE_FOR_DELETION issue (bug #8303)
    
    Check for HAVE_CTDB_CONTROL_SCHEDULE_FOR_DELETION_DECL instead of
    CTDB_CONTROL_SCHEDULE_FOR_DELETION, which is an enum member and not a
    define.
    
    Signed-off-by: Stefan Metzmacher <metze at samba.org>
    
    Autobuild-User: Stefan Metzmacher <metze at samba.org>
    Autobuild-Date: Tue Jul 12 18:56:30 CEST 2011 on sn-devel-104

commit ee762398852bb72666fa457d7a8c0b129983899c
Author: Stefan Metzmacher <metze at samba.org>
Date:   Tue Jul 12 09:26:53 2011 +0200

    s4:libcli/raw: s/SMBchkpth/SMBcheckpath
    
    metze

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

Summary of changes:
 source3/lib/dbwrap_ctdb.c        |    4 ++--
 source4/libcli/raw/rawfile.c     |    2 +-
 source4/libcli/raw/smb.h         |    2 +-
 source4/smb_server/smb/receive.c |    2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/lib/dbwrap_ctdb.c b/source3/lib/dbwrap_ctdb.c
index 255a673..2464b3b 100644
--- a/source3/lib/dbwrap_ctdb.c
+++ b/source3/lib/dbwrap_ctdb.c
@@ -911,7 +911,7 @@ static NTSTATUS db_ctdb_store(struct db_record *rec, TDB_DATA data, int flag)
 
 
 
-#ifdef CTDB_CONTROL_SCHEDULE_FOR_DELETION
+#ifdef HAVE_CTDB_CONTROL_SCHEDULE_FOR_DELETION_DECL
 static NTSTATUS db_ctdb_send_schedule_for_deletion(struct db_record *rec)
 {
 	NTSTATUS status;
@@ -974,7 +974,7 @@ static NTSTATUS db_ctdb_delete(struct db_record *rec)
 		return status;
 	}
 
-#ifdef CTDB_CONTROL_SCHEDULE_FOR_DELETION
+#ifdef HAVE_CTDB_CONTROL_SCHEDULE_FOR_DELETION_DECL
 	status = db_ctdb_send_schedule_for_deletion(rec);
 #endif
 
diff --git a/source4/libcli/raw/rawfile.c b/source4/libcli/raw/rawfile.c
index 1cacaab..0b4ad9e 100644
--- a/source4/libcli/raw/rawfile.c
+++ b/source4/libcli/raw/rawfile.c
@@ -933,7 +933,7 @@ struct smbcli_request *smb_raw_chkpath_send(struct smbcli_tree *tree, union smb_
 {
 	struct smbcli_request *req; 
 
-	SETUP_REQUEST(SMBchkpth, 0, 0);
+	SETUP_REQUEST(SMBcheckpath, 0, 0);
 
 	smbcli_req_append_ascii4(req, parms->chkpath.in.path, STR_TERMINATE);
 
diff --git a/source4/libcli/raw/smb.h b/source4/libcli/raw/smb.h
index ee22ae0..b9b6584 100644
--- a/source4/libcli/raw/smb.h
+++ b/source4/libcli/raw/smb.h
@@ -266,7 +266,7 @@
 #define SMBunlock     0x0D   /* unlock byte range */
 #define SMBctemp      0x0E   /* create temporary file */
 #define SMBmknew      0x0F   /* make new file */
-#define SMBchkpth     0x10   /* check directory path */
+#define SMBcheckpath  0x10   /* check directory path */
 #define SMBexit       0x11   /* process exit */
 #define SMBlseek      0x12   /* seek */
 #define SMBtcon       0x70   /* tree connect */
diff --git a/source4/smb_server/smb/receive.c b/source4/smb_server/smb/receive.c
index 1379fe3..04b0917 100644
--- a/source4/smb_server/smb/receive.c
+++ b/source4/smb_server/smb/receive.c
@@ -103,7 +103,7 @@ static const struct smb_message_struct
 /* 0x0d */ { "SMBunlock",	smbsrv_reply_unlock,		NEED_SESS|NEED_TCON },
 /* 0x0e */ { "SMBctemp",	smbsrv_reply_ctemp,		NEED_SESS|NEED_TCON },
 /* 0x0f */ { "SMBmknew",	smbsrv_reply_mknew,		NEED_SESS|NEED_TCON }, 
-/* 0x10 */ { "SMBchkpth",	smbsrv_reply_chkpth,		NEED_SESS|NEED_TCON },
+/* 0x10 */ { "SMBcheckpath",	smbsrv_reply_chkpth,		NEED_SESS|NEED_TCON },
 /* 0x11 */ { "SMBexit",		smbsrv_reply_exit,		NEED_SESS },
 /* 0x12 */ { "SMBlseek",	smbsrv_reply_lseek,		NEED_SESS|NEED_TCON },
 /* 0x13 */ { "SMBlockread",	smbsrv_reply_lockread,		NEED_SESS|NEED_TCON },


-- 
Samba Shared Repository


More information about the samba-cvs mailing list