[SCM] Samba Shared Repository - branch master updated

[Michael Adam]

The branch, master has been updated
       via  11de99a asn1: Clean up includes
       via  fe3c270 smbcontrol: Use procid_is_local
       via  2948fb3 net: Use procid_is_local
      from  8108f0d s3: smbclient: asn1_extract_blob() stops further asn1 processing by setting has_error.

https://git.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 11de99a6d83c0ec34481847d2adff9a99f41385d
Author: Volker Lendecke <vl at samba.org>
Date:   Tue Jan 5 22:00:58 2016 +0100

    asn1: Clean up includes
    
    Signed-off-by: Volker Lendecke <vl at samba.org>
    Reviewed-by: Michael Adam <obnox at samba.org>
    
    Autobuild-User(master): Michael Adam <obnox at samba.org>
    Autobuild-Date(master): Thu Jan  7 19:12:22 CET 2016 on sn-devel-144

commit fe3c270ea6e9e58100f97833119a1e6d9f8b1de9
Author: Volker Lendecke <vl at samba.org>
Date:   Wed Oct 14 11:49:57 2015 +0200

    smbcontrol: Use procid_is_local
    
    Signed-off-by: Volker Lendecke <vl at samba.org>
    Reviewed-by: Michael Adam <obnox at samba.org>

commit 2948fb347a8cd44deb358b65ad95125ab2b60c42
Author: Volker Lendecke <vl at samba.org>
Date:   Wed Oct 14 11:49:57 2015 +0200

    net: Use procid_is_local
    
    Signed-off-by: Volker Lendecke <vl at samba.org>
    Reviewed-by: Michael Adam <obnox at samba.org>

-----------------------------------------------------------------------

Summary of changes:
 lib/util/asn1.c              | 7 +++++--
 lib/util/asn1.h              | 5 +++++
 source3/utils/net_serverid.c | 2 +-
 source3/utils/smbcontrol.c   | 2 +-
 4 files changed, 12 insertions(+), 4 deletions(-)


Changeset truncated at 500 lines:

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;
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);
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;


-- 
Samba Shared Repository