[PATCH] A few cleanups
Volker Lendecke
Volker.Lendecke at SerNet.DE
Sun May 14 06:47:04 UTC 2017
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 5dd2d25c7841fd707216ec0b0a64d5fb6f987963 Mon Sep 17 00:00:00 2001
From: Volker Lendecke <vl at samba.org>
Date: Thu, 11 May 2017 21:30:30 +0200
Subject: [PATCH 1/3] libsmb: proto.h does not need ads.h
Signed-off-by: Volker Lendecke <vl at samba.org>
---
source3/libsmb/proto.h | 1 -
1 file changed, 1 deletion(-)
diff --git a/source3/libsmb/proto.h b/source3/libsmb/proto.h
index c5e28ef..137c355 100644
--- a/source3/libsmb/proto.h
+++ b/source3/libsmb/proto.h
@@ -26,7 +26,6 @@
#ifndef _LIBSMB_PROTO_H_
#define _LIBSMB_PROTO_H_
-#include "ads.h"
#include "auth_info.h"
struct smb_trans_enc_state;
--
2.1.4
From f45d8b30b44692b67f1009a2a6c9bdf82d971bc0 Mon Sep 17 00:00:00 2001
From: Volker Lendecke <vl at samba.org>
Date: Thu, 11 May 2017 21:38:50 +0200
Subject: [PATCH 2/3] winbindd: Give winbindd_ads.c its own header
Not necessary to compile all of winbind when playing with ads.h
Signed-off-by: Volker Lendecke <vl at samba.org>
---
source3/winbindd/idmap_ad_nss.c | 1 +
source3/winbindd/idmap_rfc2307.c | 2 +-
source3/winbindd/winbindd_ads.c | 1 +
source3/winbindd/winbindd_ads.h | 33 +++++++++++++++++++++++++++++++++
source3/winbindd/winbindd_proto.h | 5 -----
5 files changed, 36 insertions(+), 6 deletions(-)
create mode 100644 source3/winbindd/winbindd_ads.h
diff --git a/source3/winbindd/idmap_ad_nss.c b/source3/winbindd/idmap_ad_nss.c
index 87c7814..4f3a0ae 100644
--- a/source3/winbindd/idmap_ad_nss.c
+++ b/source3/winbindd/idmap_ad_nss.c
@@ -27,6 +27,7 @@
#include "includes.h"
#include "winbindd.h"
+#include "winbindd_ads.h"
#include "../libds/common/flags.h"
#include "ads.h"
#include "libads/ldap_schema.h"
diff --git a/source3/winbindd/idmap_rfc2307.c b/source3/winbindd/idmap_rfc2307.c
index 8ffa55b..668a7a4 100644
--- a/source3/winbindd/idmap_rfc2307.c
+++ b/source3/winbindd/idmap_rfc2307.c
@@ -25,7 +25,7 @@
#include "includes.h"
#include "winbindd.h"
-#include "ads.h"
+#include "winbindd_ads.h"
#include "idmap.h"
#include "smbldap.h"
#include "nsswitch/winbind_client.h"
diff --git a/source3/winbindd/winbindd_ads.c b/source3/winbindd/winbindd_ads.c
index d2e1ac4..c330b92 100644
--- a/source3/winbindd/winbindd_ads.c
+++ b/source3/winbindd/winbindd_ads.c
@@ -23,6 +23,7 @@
#include "includes.h"
#include "winbindd.h"
+#include "winbindd_ads.h"
#include "rpc_client/rpc_client.h"
#include "../librpc/gen_ndr/ndr_netlogon_c.h"
#include "../libds/common/flags.h"
diff --git a/source3/winbindd/winbindd_ads.h b/source3/winbindd/winbindd_ads.h
new file mode 100644
index 0000000..5f121c8
--- /dev/null
+++ b/source3/winbindd/winbindd_ads.h
@@ -0,0 +1,33 @@
+/*
+ Unix SMB/CIFS implementation.
+
+ Winbind ADS backend functions
+
+ Copyright (C) Volker Lendecke 2017
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 3 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#ifndef __WINBINDD_ADS_H__
+#define __WINBINDD_ADS_H__
+
+
+#include "ads.h"
+
+extern struct winbindd_methods ads_methods;
+
+ADS_STATUS ads_idmap_cached_connection(ADS_STRUCT **adsp,
+ const char *dom_name);
+
+#endif
diff --git a/source3/winbindd/winbindd_proto.h b/source3/winbindd/winbindd_proto.h
index ebd9b44..57b363a 100644
--- a/source3/winbindd/winbindd_proto.h
+++ b/source3/winbindd/winbindd_proto.h
@@ -23,8 +23,6 @@
#ifndef _WINBINDD_PROTO_H_
#define _WINBINDD_PROTO_H_
-#include "ads.h"
-
/* The following definitions come from winbindd/winbindd.c */
struct messaging_context *winbind_messaging_context(void);
struct imessaging_context *winbind_imessaging_context(void);
@@ -956,9 +954,6 @@ NTSTATUS open_internal_lsa_conn(TALLOC_CTX *mem_ctx,
struct rpc_pipe_client **lsa_pipe,
struct policy_handle *lsa_hnd);
-/* The following definitions come from winbindd/winbindd_ads.c */
-ADS_STATUS ads_idmap_cached_connection(ADS_STRUCT **adsp, const char *dom_name);
-
/* The following definitions come from winbindd/winbindd_irpc.c */
NTSTATUS wb_irpc_register(void);
--
2.1.4
From 0db3c84e5f95f8323946856a29de6918c484bfaa Mon Sep 17 00:00:00 2001
From: Volker Lendecke <vl at samba.org>
Date: Mon, 1 May 2017 18:29:35 +0200
Subject: [PATCH 3/3] py_passdb: Fix signed/unsigned hickups
Signed-off-by: Volker Lendecke <vl at samba.org>
---
source3/passdb/py_passdb.c | 17 ++++++-----------
1 file changed, 6 insertions(+), 11 deletions(-)
diff --git a/source3/passdb/py_passdb.c b/source3/passdb/py_passdb.c
index c49354c..214fef8 100644
--- a/source3/passdb/py_passdb.c
+++ b/source3/passdb/py_passdb.c
@@ -1910,9 +1910,8 @@ static PyObject *py_pdb_enum_group_mapping(PyObject *self, PyObject *args)
struct dom_sid *domain_sid = NULL;
GROUP_MAP **gmap = NULL;
GROUP_MAP *group_map;
- size_t num_entries;
+ size_t i, num_entries;
PyObject *py_gmap_list, *py_group_map;
- int i;
py_domain_sid = Py_None;
Py_INCREF(Py_None);
@@ -1975,10 +1974,9 @@ static PyObject *py_pdb_enum_group_members(PyObject *self, PyObject *args)
PyObject *py_group_sid;
struct dom_sid *group_sid;
uint32_t *member_rids;
- size_t num_members;
+ size_t i, num_members;
PyObject *py_sid_list;
struct dom_sid *domain_sid, *member_sid;
- int i;
if (!PyArg_ParseTuple(args, "O!:enum_group_members", dom_sid_Type, &py_group_sid)) {
talloc_free(frame);
@@ -2023,7 +2021,7 @@ static PyObject *py_pdb_enum_group_memberships(PyObject *self, PyObject *args)
TALLOC_CTX *frame = talloc_stackframe();
NTSTATUS status;
struct pdb_methods *methods;
- int i;
+ uint32_t i;
struct samu *sam_acct;
PyObject *py_sam_acct;
@@ -2358,8 +2356,7 @@ static PyObject *py_pdb_enum_aliasmem(PyObject *self, PyObject *args)
PyObject *py_alias_sid;
struct dom_sid *alias_sid, *member_sid, *tmp_sid;
PyObject *py_member_list, *py_member_sid;
- size_t num_members;
- int i;
+ size_t i, num_members;
if (!PyArg_ParseTuple(args, "O!:enum_aliasmem", dom_sid_Type, &py_alias_sid)) {
talloc_free(frame);
@@ -2904,10 +2901,9 @@ static PyObject *py_pdb_enum_trusteddoms(PyObject *self, PyObject *unused)
TALLOC_CTX *frame = talloc_stackframe();
NTSTATUS status;
struct pdb_methods *methods;
- uint32_t num_domains;
+ uint32_t i, num_domains;
struct trustdom_info **domains;
PyObject *py_domain_list, *py_dict;
- int i;
methods = pytalloc_get_ptr(self);
@@ -3160,10 +3156,9 @@ static PyObject *py_pdb_enum_trusted_domains(PyObject *self, PyObject *args)
TALLOC_CTX *frame = talloc_stackframe();
NTSTATUS status;
struct pdb_methods *methods;
- uint32_t num_domains;
+ uint32_t i, num_domains;
struct pdb_trusted_domain **td_info, *td;
PyObject *py_td_info, *py_domain_info;
- int i;
methods = pytalloc_get_ptr(self);
--
2.1.4
More information about the samba-technical
mailing list