[SCM] Samba Shared Repository - branch master updated
Christian Ambach
ambi at samba.org
Fri Sep 21 20:29:02 MDT 2012
The branch, master has been updated
via 83ed9b5 s3:pdb_ldap remove unused function
via 8df92a4 s3:rpcclient fix a compiler warning
via f480b44 s3:utils/net fix a compiler warning
from d59688a auth/kerberos: add HAVE_KRB5 guard to fix non-krb5 build after winbindd pac changes
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 83ed9b52e75215e7590f842fa7c1ec1a4e4aa6bc
Author: Christian Ambach <ambi at samba.org>
Date: Fri Sep 21 13:54:47 2012 -0700
s3:pdb_ldap remove unused function
Autobuild-User(master): Christian Ambach <ambi at samba.org>
Autobuild-Date(master): Sat Sep 22 04:28:37 CEST 2012 on sn-devel-104
commit 8df92a44fcf96a8950a1ba500dbe8febfe91b3de
Author: Christian Ambach <ambi at samba.org>
Date: Fri Sep 21 14:00:53 2012 -0700
s3:rpcclient fix a compiler warning
commit f480b44430520f998fea867aa4c2cf9e93cb8d51
Author: Christian Ambach <ambi at samba.org>
Date: Fri Sep 21 13:58:29 2012 -0700
s3:utils/net fix a compiler warning
ret might be used uninitialized in out-of-memory condition
-----------------------------------------------------------------------
Summary of changes:
source3/passdb/pdb_ldap.c | 23 -----------------------
source3/rpcclient/rpcclient.c | 2 ++
source3/utils/net_connections.c | 2 +-
3 files changed, 3 insertions(+), 24 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/passdb/pdb_ldap.c b/source3/passdb/pdb_ldap.c
index b41f58b..a5b8f0b 100644
--- a/source3/passdb/pdb_ldap.c
+++ b/source3/passdb/pdb_ldap.c
@@ -347,29 +347,6 @@ int ldapsam_search_suffix_by_name(struct ldapsam_privates *ldap_state,
}
/*******************************************************************
- Run the search by rid.
-******************************************************************/
-
-static int ldapsam_search_suffix_by_rid (struct ldapsam_privates *ldap_state,
- uint32_t rid, LDAPMessage ** result,
- const char **attr)
-{
- char *filter = NULL;
- int rc;
-
- filter = talloc_asprintf(talloc_tos(), "(&(rid=%i)%s)", rid,
- get_objclass_filter(ldap_state->schema_ver));
- if (!filter) {
- return LDAP_NO_MEMORY;
- }
-
- rc = smbldap_search_suffix(ldap_state->smbldap_state,
- filter, attr, result);
- TALLOC_FREE(filter);
- return rc;
-}
-
-/*******************************************************************
Run the search by SID.
******************************************************************/
diff --git a/source3/rpcclient/rpcclient.c b/source3/rpcclient/rpcclient.c
index 7b31e15..0dad971 100644
--- a/source3/rpcclient/rpcclient.c
+++ b/source3/rpcclient/rpcclient.c
@@ -704,6 +704,8 @@ static NTSTATUS do_cmd(struct cli_state *cli,
case PIPE_AUTH_TYPE_SPNEGO_KRB5:
oid = GENSEC_OID_KERBEROS5;
break;
+ case PIPE_AUTH_TYPE_SPNEGO_NONE:
+ break;
}
ntresult = cli_rpc_pipe_open_spnego(
cli, cmd_entry->table,
diff --git a/source3/utils/net_connections.c b/source3/utils/net_connections.c
index b713ed9..a74d53f 100644
--- a/source3/utils/net_connections.c
+++ b/source3/utils/net_connections.c
@@ -194,7 +194,7 @@ static int delete_orphans(struct cclean_ctx *ctx)
static int cclean(bool verbose, bool dry_run, bool automatic)
{
- int ret;
+ int ret = -1;
struct cclean_ctx *ctx = talloc_zero(talloc_tos(), struct cclean_ctx);
if (ctx == NULL) {
d_printf("Out of memory\n");
--
Samba Shared Repository
More information about the samba-cvs
mailing list