svn commit: samba r12898 - in branches/SAMBA_4_0/source: nbt_server nbt_server/wins param

metze at samba.org metze at samba.org
Fri Jan 13 10:26:48 GMT 2006


Author: metze
Date: 2006-01-13 10:26:47 +0000 (Fri, 13 Jan 2006)
New Revision: 12898

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=12898

Log:
prepare the 'wins hook' feature, but we only debug out a 'TODO: run script ...'

metze
Added:
   branches/SAMBA_4_0/source/nbt_server/wins/wins_hook.c
Modified:
   branches/SAMBA_4_0/source/nbt_server/config.mk
   branches/SAMBA_4_0/source/nbt_server/wins/winsdb.c
   branches/SAMBA_4_0/source/nbt_server/wins/winsdb.h
   branches/SAMBA_4_0/source/param/loadparm.c


Changeset:
Modified: branches/SAMBA_4_0/source/nbt_server/config.mk
===================================================================
--- branches/SAMBA_4_0/source/nbt_server/config.mk	2006-01-13 08:38:11 UTC (rev 12897)
+++ branches/SAMBA_4_0/source/nbt_server/config.mk	2006-01-13 10:26:47 UTC (rev 12898)
@@ -4,7 +4,8 @@
 # Start SUBSYSTEM WINSDB
 [SUBSYSTEM::WINSDB]
 OBJ_FILES = \
-		wins/winsdb.o
+		wins/winsdb.o \
+		wins/wins_hook.o
 PRIVATE_PROTO_HEADER = wins/winsdb_proto.h
 REQUIRED_SUBSYSTEMS = \
 		LIBLDB

Added: branches/SAMBA_4_0/source/nbt_server/wins/wins_hook.c
===================================================================
--- branches/SAMBA_4_0/source/nbt_server/wins/wins_hook.c	2006-01-13 08:38:11 UTC (rev 12897)
+++ branches/SAMBA_4_0/source/nbt_server/wins/wins_hook.c	2006-01-13 10:26:47 UTC (rev 12898)
@@ -0,0 +1,47 @@
+/* 
+   Unix SMB/CIFS implementation.
+
+   wins hook feature, we run a specified script
+   which can then do some custom actions
+
+   Copyright (C) Stefan Metzmacher	2005
+      
+   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
+   (at your option) any later version.
+   
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   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.
+*/
+
+#include "includes.h"
+#include "nbt_server/nbt_server.h"
+#include "nbt_server/wins/winsdb.h"
+
+static const char *wins_hook_action_string(enum wins_hook_action action)
+{
+	switch (action) {
+	case WINS_HOOK_ADD:	return "WINS_HOOK_ADD";
+	case WINS_HOOK_MODIFY:	return "WINS_HOOK_MODIFY";
+	case WINS_HOOK_DELETE:	return "WINS_HOOK_DELETE";
+	}
+
+	return "WINS_HOOK_ACTION_UNKNOWN";
+}
+
+void wins_hook(struct winsdb_handle *h, struct winsdb_record *rec, enum wins_hook_action action)
+{
+	const char *script = lp_wins_hook();
+	if (!script || !script[0]) return;
+
+	DEBUG(0,("TODO: call wins hook '%s' '%s' for name '%s'\n",
+		script, wins_hook_action_string(action),
+		nbt_name_string(rec, rec->name)));
+}

Modified: branches/SAMBA_4_0/source/nbt_server/wins/winsdb.c
===================================================================
--- branches/SAMBA_4_0/source/nbt_server/wins/winsdb.c	2006-01-13 08:38:11 UTC (rev 12897)
+++ branches/SAMBA_4_0/source/nbt_server/wins/winsdb.c	2006-01-13 10:26:47 UTC (rev 12898)
@@ -676,6 +676,8 @@
 	trans = ldb_transaction_commit(wins_db);
 	if (trans != LDB_SUCCESS) goto failed;
 
+	wins_hook(h, rec, WINS_HOOK_ADD);
+
 	talloc_free(tmp_ctx);
 	return NBT_RCODE_OK;
 
@@ -723,6 +725,8 @@
 	trans = ldb_transaction_commit(wins_db);
 	if (trans != LDB_SUCCESS) goto failed;
 
+	wins_hook(h, rec, WINS_HOOK_MODIFY);
+
 	talloc_free(tmp_ctx);
 	return NBT_RCODE_OK;
 
@@ -756,6 +760,8 @@
 	trans = ldb_transaction_commit(wins_db);
 	if (trans != LDB_SUCCESS) goto failed;
 
+	wins_hook(h, rec, WINS_HOOK_DELETE);
+
 	talloc_free(tmp_ctx);
 	return NBT_RCODE_OK;
 

Modified: branches/SAMBA_4_0/source/nbt_server/wins/winsdb.h
===================================================================
--- branches/SAMBA_4_0/source/nbt_server/wins/winsdb.h	2006-01-13 08:38:11 UTC (rev 12897)
+++ branches/SAMBA_4_0/source/nbt_server/wins/winsdb.h	2006-01-13 10:26:47 UTC (rev 12898)
@@ -55,4 +55,11 @@
 	const char *local_owner;
 };
 
+enum wins_hook_action {
+	WINS_HOOK_ADD		= 0,
+	WINS_HOOK_MODIFY	= 1,
+	WINS_HOOK_DELETE	= 2
+};
+
+
 #include "nbt_server/wins/winsdb_proto.h"

Modified: branches/SAMBA_4_0/source/param/loadparm.c
===================================================================
--- branches/SAMBA_4_0/source/param/loadparm.c	2006-01-13 08:38:11 UTC (rev 12897)
+++ branches/SAMBA_4_0/source/param/loadparm.c	2006-01-13 10:26:47 UTC (rev 12898)
@@ -154,6 +154,7 @@
 	char *socket_options;
 	BOOL bWINSsupport;
 	BOOL bWINSdnsProxy;
+	char *szWINSHook; 
 	BOOL bLocalMaster;
 	BOOL bPreferredMaster;
 	BOOL bEncryptPasswords;
@@ -510,6 +511,7 @@
 	{"wins server", P_LIST, P_GLOBAL, &Globals.szWINSservers, NULL, NULL, FLAG_BASIC | FLAG_ADVANCED | FLAG_WIZARD | FLAG_DEVELOPER},
 	{"wins support", P_BOOL, P_GLOBAL, &Globals.bWINSsupport, NULL, NULL, FLAG_BASIC | FLAG_ADVANCED | FLAG_WIZARD | FLAG_DEVELOPER},
 	{"dns proxy", P_BOOL, P_GLOBAL, &Globals.bWINSdnsProxy, NULL, NULL, FLAG_BASIC | FLAG_ADVANCED | FLAG_WIZARD | FLAG_DEVELOPER},
+	{"wins hook", P_STRING, P_GLOBAL, &Globals.szWINSHook, NULL, NULL, FLAG_ADVANCED}, 
 
 	{"Locking Options", P_SEP, P_SEPARATOR},
 	
@@ -846,6 +848,7 @@
 FN_GLOBAL_BOOL(lp_disable_netbios, &Globals.bDisableNetbios)
 FN_GLOBAL_BOOL(lp_wins_support, &Globals.bWINSsupport)
 FN_GLOBAL_BOOL(lp_wins_dns_proxy, &Globals.bWINSdnsProxy)
+FN_GLOBAL_STRING(lp_wins_hook, &Globals.szWINSHook)
 FN_GLOBAL_BOOL(lp_local_master, &Globals.bLocalMaster)
 FN_GLOBAL_BOOL(lp_readraw, &Globals.bReadRaw)
 FN_GLOBAL_BOOL(lp_large_readwrite, &Globals.bLargeReadwrite)



More information about the samba-cvs mailing list