diff options
| -rw-r--r-- | librpc/ndr/ndr_sec_helper.c | 1 | ||||
| -rw-r--r-- | source3/include/proto.h | 4 | ||||
| -rw-r--r-- | source3/lib/util_sid.c | 1 | ||||
| -rw-r--r-- | source3/librpc/ndr/sid.c | 59 | ||||
| -rw-r--r-- | source3/modules/vfs_smb_traffic_analyzer.c | 1 | ||||
| -rw-r--r-- | source3/nmbd/nmbd_processlogon.c | 1 | ||||
| -rw-r--r-- | source3/winbindd/winbindd_pam.c | 1 |
7 files changed, 5 insertions, 63 deletions
diff --git a/librpc/ndr/ndr_sec_helper.c b/librpc/ndr/ndr_sec_helper.c index af6ca0936f..7207c0b6ba 100644 --- a/librpc/ndr/ndr_sec_helper.c +++ b/librpc/ndr/ndr_sec_helper.c @@ -23,6 +23,7 @@ #include "includes.h" #include "librpc/gen_ndr/ndr_security.h" +#include "../libcli/security/dom_sid.h" #if _SAMBA_BUILD_ == 4 #include "libcli/security/security.h" #endif diff --git a/source3/include/proto.h b/source3/include/proto.h index 6ccefe1a39..5d8a99771f 100644 --- a/source3/include/proto.h +++ b/source3/include/proto.h @@ -2061,10 +2061,6 @@ _PUBLIC_ void ndr_print_sockaddr_storage(struct ndr_print *ndr, const char *name const char *ndr_errstr(enum ndr_err_code err); extern const struct ndr_syntax_id null_ndr_syntax_id; -/* The following definitions come from librpc/ndr/sid.c */ - -char *dom_sid_string(TALLOC_CTX *mem_ctx, const struct dom_sid *sid); - /* The following definitions come from libsmb/cliconnect.c */ ADS_STATUS cli_session_setup_spnego(struct cli_state *cli, const char *user, diff --git a/source3/lib/util_sid.c b/source3/lib/util_sid.c index bbb1b53974..e59b276977 100644 --- a/source3/lib/util_sid.c +++ b/source3/lib/util_sid.c @@ -24,6 +24,7 @@ #include "includes.h" #include "../librpc/gen_ndr/ndr_security.h" +#include "../libcli/security/dom_sid.h" /* * Some useful sids, more well known sids can be found at diff --git a/source3/librpc/ndr/sid.c b/source3/librpc/ndr/sid.c deleted file mode 100644 index eb5c2c477d..0000000000 --- a/source3/librpc/ndr/sid.c +++ /dev/null @@ -1,59 +0,0 @@ -/* - Unix SMB/CIFS implementation. - - libndr interface - - Copyright (C) Andrew Tridgell 2003 - - 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/>. -*/ - -#include "includes.h" - -/* - convert a dom_sid to a string -*/ -char *dom_sid_string(TALLOC_CTX *mem_ctx, const struct dom_sid *sid) -{ - int i, ofs, maxlen; - uint32_t ia; - char *ret; - - if (!sid) { - return talloc_strdup(mem_ctx, "(NULL SID)"); - } - - maxlen = sid->num_auths * 11 + 25; - ret = (char *)talloc_size(mem_ctx, maxlen); - if (!ret) return talloc_strdup(mem_ctx, "(SID ERR)"); - - /* - * BIG NOTE: this function only does SIDS where the identauth is not - * >= ^32 in a range of 2^48. - */ - - ia = (sid->id_auth[5]) + - (sid->id_auth[4] << 8 ) + - (sid->id_auth[3] << 16) + - (sid->id_auth[2] << 24); - - ofs = snprintf(ret, maxlen, "S-%u-%lu", - (unsigned int)sid->sid_rev_num, (unsigned long)ia); - - for (i = 0; i < sid->num_auths; i++) { - ofs += snprintf(ret + ofs, maxlen - ofs, "-%lu", (unsigned long)sid->sub_auths[i]); - } - - return ret; -} diff --git a/source3/modules/vfs_smb_traffic_analyzer.c b/source3/modules/vfs_smb_traffic_analyzer.c index a73d9d0755..bf7b4138d0 100644 --- a/source3/modules/vfs_smb_traffic_analyzer.c +++ b/source3/modules/vfs_smb_traffic_analyzer.c @@ -22,6 +22,7 @@ #include "includes.h" #include "../lib/crypto/crypto.h" #include "vfs_smb_traffic_analyzer.h" +#include "../libcli/security/dom_sid.h" /* abstraction for the send_over_network function */ enum sock_type {INTERNET_SOCKET = 0, UNIX_DOMAIN_SOCKET}; diff --git a/source3/nmbd/nmbd_processlogon.c b/source3/nmbd/nmbd_processlogon.c index d591f7062c..f07628f3ef 100644 --- a/source3/nmbd/nmbd_processlogon.c +++ b/source3/nmbd/nmbd_processlogon.c @@ -27,6 +27,7 @@ #include "../libcli/netlogon.h" #include "../libcli/cldap/cldap.h" #include "../lib/tsocket/tsocket.h" +#include "../libcli/security/dom_sid.h" struct sam_database_info { uint32 index; diff --git a/source3/winbindd/winbindd_pam.c b/source3/winbindd/winbindd_pam.c index 9848bea6fe..ef8d464008 100644 --- a/source3/winbindd/winbindd_pam.c +++ b/source3/winbindd/winbindd_pam.c @@ -32,6 +32,7 @@ #include "smb_krb5.h" #include "../lib/crypto/arcfour.h" #include "rpc_server/srv_samr_util.h" +#include "../libcli/security/dom_sid.h" #undef DBGC_CLASS #define DBGC_CLASS DBGC_WINBIND |