Revert the merge of 3.3.0~pre2 in upstream branch

git-svn-id: svn://svn.debian.org/svn/pkg-samba/branches/samba/upstream@2200 fc4039ab-9d04-0410-8cac-899223bdd6b0

1 files changed, 5 insertions, 31 deletions

diff --git a/source/lib/util.c b/source/lib/util.c
index 201d87aeb5..dafaf03d56 100644
--- a/source/lib/util.c
+++ b/source/lib/util.c
@@ -60,6 +60,8 @@ enum protocol_types Protocol = PROTOCOL_COREPLUS;
 /* this is used by the chaining code */
 int chain_size = 0;
 
+int trans_num = 0;
+
 static enum remote_arch_types ra_type = RA_UNKNOWN;
 
 /***********************************************************************
@@ -348,11 +350,6 @@ int get_cmdline_auth_info_signing_state(void)
 	return cmdline_auth_info.signing_state;
 }
 
-void set_cmdline_auth_info_use_kerberos(bool b)
-{
-        cmdline_auth_info.use_kerberos = b;
-}
-
 bool get_cmdline_auth_info_use_kerberos(void)
 {
 	return cmdline_auth_info.use_kerberos;
@@ -1907,10 +1904,10 @@ bool is_in_path(const char *name, name_compare_entry *namelist, bool case_sensit
  if possible.
 ********************************************************************/
  
-void set_namearray(name_compare_entry **ppname_array, const char *namelist)
+void set_namearray(name_compare_entry **ppname_array, char *namelist)
 {
 	char *name_end;
-	const char *nameptr = namelist;
+	char *nameptr = namelist;
 	int num_entries = 0;
 	int i;
 
@@ -2603,19 +2600,6 @@ char *lib_path(const char *name)
 }
 
 /**
- * @brief Returns an absolute path to a file in the Samba modules directory.
- *
- * @param name File to find, relative to MODULESDIR.
- *
- * @retval Pointer to a string containing the full path.
- **/
-
-char *modules_path(const char *name)
-{
-	return talloc_asprintf(talloc_tos(), "%s/%s", get_dyn_MODULESDIR(), name);
-}
-
-/**
  * @brief Returns an absolute path to a file in the Samba data directory.
  *
  * @param name File to find, relative to CODEPAGEDIR.
@@ -3087,7 +3071,7 @@ struct server_id interpret_pid(const char *pid_string)
 		result.pid = pid;
 	}
 	else if (sscanf(pid_string, "%u", &pid) == 1) {
-		result.vnn = get_my_vnn();
+		result.vnn = NONCLUSTER_VNN;
 		result.pid = pid;
 	}
 	else {
@@ -3466,16 +3450,6 @@ bool is_valid_policy_hnd(const POLICY_HND *hnd)
 	return (memcmp(&tmp, hnd, sizeof(tmp)) != 0);
 }
 
-bool policy_hnd_equal(const struct policy_handle *hnd1,
-		      const struct policy_handle *hnd2)
-{
-	if (!hnd1 || !hnd2) {
-		return false;
-	}
-
-	return (memcmp(hnd1, hnd2, sizeof(*hnd1)) == 0);
-}
-
 /****************************************************************
  strip off leading '\\' from a hostname
 ****************************************************************/