[PATCH] Tiny cleanups

[Volker Lendecke]

Hi!

Review appreciated!

Thanks, Volker

-- 
SerNet GmbH, Bahnhofsallee 1b, 37081 Göttingen
phone: +49-551-370000-0, fax: +49-551-370000-9
AG Göttingen, HRB 2816, GF: Dr. Johannes Loxen
http://www.sernet.de, mailto:kontakt at sernet.de
-------------- next part --------------
From 0931d006ed5ce070a0153eb28e5878a755310f2b Mon Sep 17 00:00:00 2001
From: Volker Lendecke <vl at samba.org>
Date: Wed, 14 Oct 2015 11:49:57 +0200
Subject: [PATCH 1/3] net: Use procid_is_local

Signed-off-by: Volker Lendecke <vl at samba.org>
---
 source3/utils/net_serverid.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/source3/utils/net_serverid.c b/source3/utils/net_serverid.c
index 630a7de..f228c91 100644
--- a/source3/utils/net_serverid.c
+++ b/source3/utils/net_serverid.c
@@ -51,7 +51,7 @@ static int net_serverid_wipe_fn(struct db_record *rec,
 {
 	NTSTATUS status;
 
-	if (id->vnn != get_my_vnn()) {
+	if (!procid_is_local(id)) {
 		return 0;
 	}
 	status = dbwrap_record_delete(rec);
-- 
2.1.4


From a85a85ea0a2e1a535c453747db0b98d0f93d9e41 Mon Sep 17 00:00:00 2001
From: Volker Lendecke <vl at samba.org>
Date: Wed, 14 Oct 2015 11:49:57 +0200
Subject: [PATCH 2/3] smbcontrol: Use procid_is_local

Signed-off-by: Volker Lendecke <vl at samba.org>
---
 source3/utils/smbcontrol.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/source3/utils/smbcontrol.c b/source3/utils/smbcontrol.c
index d1eb7dd..ad602b3 100644
--- a/source3/utils/smbcontrol.c
+++ b/source3/utils/smbcontrol.c
@@ -325,7 +325,7 @@ static int stack_trace_server(const struct server_id *id,
 			      uint32_t msg_flags,
 			      void *priv)
 {
-	if (id->vnn == get_my_vnn()) {
+	if (procid_is_local(id)) {
 		print_stack_trace(procid_to_pid(id), (int *)priv);
 	}
 	return 0;
-- 
2.1.4


From 17332e483cd2074775797971760ca083a4764f64 Mon Sep 17 00:00:00 2001
From: Volker Lendecke <vl at samba.org>
Date: Tue, 5 Jan 2016 22:00:58 +0100
Subject: [PATCH 3/3] asn1: Clean up includes

Signed-off-by: Volker Lendecke <vl at samba.org>
---
 lib/util/asn1.c | 7 +++++--
 lib/util/asn1.h | 5 +++++
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/lib/util/asn1.c b/lib/util/asn1.c
index fed6590..9ce7c23 100644
--- a/lib/util/asn1.c
+++ b/lib/util/asn1.c
@@ -17,8 +17,11 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include "includes.h"
-#include "../lib/util/asn1.h"
+#include "replace.h"
+#include "system/locale.h"
+#include "lib/util/asn1.h"
+#include "lib/util/debug.h"
+#include "lib/util/samba_util.h"
 
 struct nesting {
 	off_t start;
diff --git a/lib/util/asn1.h b/lib/util/asn1.h
index 4eb8506..128858f 100644
--- a/lib/util/asn1.h
+++ b/lib/util/asn1.h
@@ -20,6 +20,11 @@
 #ifndef _ASN_1_H
 #define _ASN_1_H
 
+#include "replace.h"
+#include <talloc.h>
+#include "lib/util/data_blob.h"
+
+
 struct nesting;
 struct asn1_data;
 typedef struct asn1_data ASN1_DATA;
-- 
2.1.4