[PATCH] 3 small cleanups

Volker Lendecke vl at samba.org
Tue Dec 27 10:39:19 UTC 2016


Hi!

Review appreciated!

Thanks, Volker
-------------- next part --------------
>From eb4b6f69a21b473b634210fa65ce45c8ab53d394 Mon Sep 17 00:00:00 2001
From: Volker Lendecke <vl at samba.org>
Date: Tue, 6 Dec 2016 12:23:33 +0000
Subject: [PATCH 1/3] idl: Fix a comment typo

Signed-off-by: Volker Lendecke <vl at samba.org>
---
 librpc/idl/dnsserver.idl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/librpc/idl/dnsserver.idl b/librpc/idl/dnsserver.idl
index c7742e7d270..50cbfbee90f 100644
--- a/librpc/idl/dnsserver.idl
+++ b/librpc/idl/dnsserver.idl
@@ -1,7 +1,7 @@
 #include "idl_types.h"
 /*
   dnsserver interface definition
-  for a protocol descrition see [MS-DNSP].pdf
+  for a protocol description see [MS-DNSP].pdf
 */
 
 import "misc.idl", "dnsp.idl";
-- 
2.11.0


>From b223dd1d7a84d0197033eb47a945ff24cd3408fc Mon Sep 17 00:00:00 2001
From: Volker Lendecke <vl at samba.org>
Date: Mon, 19 Dec 2016 19:32:46 +0100
Subject: [PATCH 2/3] lib: Fix whitespace in lmhosts.c

Signed-off-by: Volker Lendecke <vl at samba.org>
---
 libcli/nbt/lmhosts.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/libcli/nbt/lmhosts.c b/libcli/nbt/lmhosts.c
index 722f6adc63d..f47d8b9804f 100644
--- a/libcli/nbt/lmhosts.c
+++ b/libcli/nbt/lmhosts.c
@@ -159,9 +159,9 @@ void endlmhosts(FILE *fp)
  Resolve via "lmhosts" method.
 *********************************************************/
 
-NTSTATUS resolve_lmhosts_file_as_sockaddr(const char *lmhosts_file, 
+NTSTATUS resolve_lmhosts_file_as_sockaddr(const char *lmhosts_file,
 					  const char *name, int name_type,
-					  TALLOC_CTX *mem_ctx, 
+					  TALLOC_CTX *mem_ctx,
 					  struct sockaddr_storage **return_iplist,
 					  int *return_count)
 {
@@ -205,8 +205,8 @@ NTSTATUS resolve_lmhosts_file_as_sockaddr(const char *lmhosts_file,
 			TALLOC_FREE(lmhost_name);
 			continue;
 		}
-		
-		*return_iplist = talloc_realloc(ctx, (*return_iplist), 
+
+		*return_iplist = talloc_realloc(ctx, (*return_iplist),
 						struct sockaddr_storage,
 						(*return_count)+1);
 
-- 
2.11.0


>From 3fbd2301afc005888ee3ce3853ac59f72a2d26a8 Mon Sep 17 00:00:00 2001
From: Volker Lendecke <vl at samba.org>
Date: Wed, 21 Dec 2016 09:48:15 +0000
Subject: [PATCH 3/3] lib: Fix a comment in idmap_cache.c

Signed-off-by: Volker Lendecke <vl at samba.org>
---
 source3/lib/idmap_cache.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/source3/lib/idmap_cache.c b/source3/lib/idmap_cache.c
index 11bda393d0e..1e8a1ebc607 100644
--- a/source3/lib/idmap_cache.c
+++ b/source3/lib/idmap_cache.c
@@ -274,12 +274,12 @@ bool idmap_cache_find_gid2sid(gid_t gid, struct dom_sid *sid, bool *expired)
 /**
  * Store a mapping in the idmap cache
  * @param[in] sid		the sid to map
- * @param[in] gid		the gid to map
+ * @param[in] unix_id		the unix_id to map
  *
  * If both parameters are valid values, then a positive mapping in both
  * directions is stored. If "is_null_sid(sid)" is true, then this will be a
- * negative mapping of gid, we want to cache that for this gid we could not
- * find anything. Likewise if "gid==-1", then we want to cache that we did not
+ * negative mapping of xid, we want to cache that for this xid we could not
+ * find anything. Likewise if "xid==-1", then we want to cache that we did not
  * find a mapping for the sid passed here.
  */
 
@@ -315,7 +315,7 @@ void idmap_cache_set_sid2unixid(const struct dom_sid *sid, struct unixid *unix_i
 	}
 	if (unix_id->id != -1) {
 		if (is_null_sid(sid)) {
-			/* negative gid mapping */
+			/* negative xid mapping */
 			fstrcpy(value, "-");
 			timeout = lp_idmap_negative_cache_time();
 		}
-- 
2.11.0



More information about the samba-technical mailing list