From 5512dacbca699ab06df045ca7f1253c6a58251af Mon Sep 17 00:00:00 2001
From: Günther Deschner <gd@samba.org>
Date: Mon, 9 Jul 2007 15:48:17 +0000
Subject: r23770: Some minor cleanups in libgpo (including some valgrind
 errors, uninitialized vars, etc.)

Guenther
(This used to be commit 1a2878db2d2fcdc53fa74fea48b82a1903e6a1f1)
---
 source3/libgpo/gpo_fetch.c | 52 +++++++++++++++++++++++++---------------------
 1 file changed, 28 insertions(+), 24 deletions(-)

(limited to 'source3/libgpo/gpo_fetch.c')

diff --git a/source3/libgpo/gpo_fetch.c b/source3/libgpo/gpo_fetch.c
index abc5ab4684..c2ba7c2d82 100644
--- a/source3/libgpo/gpo_fetch.c
+++ b/source3/libgpo/gpo_fetch.c
@@ -24,13 +24,12 @@
  explode the GPO CIFS URI into their components
 ****************************************************************/
 
-NTSTATUS ads_gpo_explode_filesyspath(ADS_STRUCT *ads, 
-				     TALLOC_CTX *mem_ctx, 
-				     const char *file_sys_path, 
-				     char **server, 
-				     char **service, 
-				     char **nt_path,
-				     char **unix_path)
+NTSTATUS gpo_explode_filesyspath(TALLOC_CTX *mem_ctx, 
+				 const char *file_sys_path, 
+				 char **server, 
+				 char **service, 
+				 char **nt_path,
+				 char **unix_path)
 {
 	fstring tok;
 	pstring path;
@@ -40,6 +39,10 @@ NTSTATUS ads_gpo_explode_filesyspath(ADS_STRUCT *ads,
 	*nt_path = NULL;
 	*unix_path = NULL;
 
+	if (!file_sys_path) {
+		return NT_STATUS_OK;
+	}
+
 	if (!next_token(&file_sys_path, tok, "\\", sizeof(tok))) {
 		return NT_STATUS_INVALID_PARAMETER;
 	}
@@ -76,9 +79,8 @@ NTSTATUS ads_gpo_explode_filesyspath(ADS_STRUCT *ads,
  prepare the local disc storage for "unix_path"
 ****************************************************************/
 
-NTSTATUS ads_gpo_prepare_local_store(ADS_STRUCT *ads, 
-				     TALLOC_CTX *mem_ctx, 
-				     const char *unix_path)
+static NTSTATUS gpo_prepare_local_store(TALLOC_CTX *mem_ctx, 
+					const char *unix_path)
 {
 	const char *top_dir = lock_path(GPO_CACHE_DIR);
 	char *current_dir;
@@ -115,21 +117,20 @@ NTSTATUS ads_gpo_prepare_local_store(ADS_STRUCT *ads,
  download a full GPO via CIFS
 ****************************************************************/
 
-NTSTATUS ads_fetch_gpo_files(ADS_STRUCT *ads, 
-			    TALLOC_CTX *mem_ctx, 
-			    struct cli_state *cli, 
-			    struct GROUP_POLICY_OBJECT *gpo)
+NTSTATUS gpo_fetch_files(TALLOC_CTX *mem_ctx, 
+			 struct cli_state *cli, 
+			 struct GROUP_POLICY_OBJECT *gpo)
 {
 	NTSTATUS result;
 	char *server, *service, *nt_path, *unix_path, *nt_ini_path, *unix_ini_path;
 
-	result = ads_gpo_explode_filesyspath(ads, mem_ctx, gpo->file_sys_path, 
-					     &server, &service, &nt_path, &unix_path);
+	result = gpo_explode_filesyspath(mem_ctx, gpo->file_sys_path, 
+					 &server, &service, &nt_path, &unix_path);
 	if (!NT_STATUS_IS_OK(result)) {
 		goto out;
 	}
 
-	result = ads_gpo_prepare_local_store(ads, mem_ctx, unix_path);
+	result = gpo_prepare_local_store(mem_ctx, unix_path);
 	if (!NT_STATUS_IS_OK(result)) {
 		goto out;
 	}
@@ -161,23 +162,26 @@ NTSTATUS ads_fetch_gpo_files(ADS_STRUCT *ads,
  get the locally stored gpt.ini version number
 ****************************************************************/
 
-NTSTATUS ads_gpo_get_sysvol_gpt_version(ADS_STRUCT *ads, 
-					TALLOC_CTX *mem_ctx, 
-					const char *unix_path, 
-					uint32 *sysvol_version,
-					char **display_name)
+NTSTATUS gpo_get_sysvol_gpt_version(TALLOC_CTX *mem_ctx, 
+				    const char *unix_path, 
+				    uint32 *sysvol_version,
+				    char **display_name)
 {
 	NTSTATUS status;
-	uint32 version;
+	uint32 version = 0;
 	char *local_path = NULL;
 	char *name = NULL;
 
+	if (!unix_path) {
+		return NT_STATUS_OK;
+	}
+
 	local_path = talloc_asprintf(mem_ctx, "%s/%s", unix_path, GPT_INI);
 	NT_STATUS_HAVE_NO_MEMORY(local_path);
 
 	status = parse_gpt_ini(mem_ctx, local_path, &version, &name);
 	if (!NT_STATUS_IS_OK(status)) {
-		DEBUG(10,("ads_gpo_get_sysvol_gpt_version: failed to parse ini [%s]: %s\n", 
+		DEBUG(10,("gpo_get_sysvol_gpt_version: failed to parse ini [%s]: %s\n", 
 			unix_path, nt_errstr(status)));
 		return status;
 	}
-- 
cgit