The branch, master has been updated
via debd6da s3-lsa: fix some uninitialized variables in our lsa server.
via dcf23f0 s3-pdb_ipa: remove uninitialized (and unused) status code.
from a69f634 s4-descriptor: Fixed some compiler warnings.
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit debd6da27a78620053fb380dfc446de4714c3d0a
Author: Günther Deschner <[email protected]>
Date: Mon Feb 21 17:35:45 2011 +0100
s3-lsa: fix some uninitialized variables in our lsa server.
Guenther
Autobuild-User: Günther Deschner <[email protected]>
Autobuild-Date: Mon Feb 21 18:47:30 CET 2011 on sn-devel-104
commit dcf23f022f9d25f871c60ddb6d173c93932b723f
Author: Günther Deschner <[email protected]>
Date: Mon Feb 21 17:32:48 2011 +0100
s3-pdb_ipa: remove uninitialized (and unused) status code.
Guenther
-----------------------------------------------------------------------
Summary of changes:
source3/passdb/pdb_ipa.c | 3 +--
source3/rpc_server/lsa/srv_lsa_nt.c | 6 +++---
2 files changed, 4 insertions(+), 5 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/passdb/pdb_ipa.c b/source3/passdb/pdb_ipa.c
index 9e52e95..feae228 100644
--- a/source3/passdb/pdb_ipa.c
+++ b/source3/passdb/pdb_ipa.c
@@ -809,7 +809,6 @@ static NTSTATUS ipasam_add_objectclasses(struct
ldapsam_privates *ldap_state,
{
char *dn;
LDAPMod **mods = NULL;
- NTSTATUS status;
int ret;
char *princ;
const char *domain;
@@ -861,7 +860,7 @@ static NTSTATUS ipasam_add_objectclasses(struct
ldapsam_privates *ldap_state,
if (ret != LDAP_SUCCESS) {
DEBUG(1, ("failed to modify/add user with uid = %s (dn = %s)\n",
pdb_get_username(sampass),dn));
- return status;
+ return NT_STATUS_LDAP(ret);
}
return NT_STATUS_OK;
diff --git a/source3/rpc_server/lsa/srv_lsa_nt.c
b/source3/rpc_server/lsa/srv_lsa_nt.c
index 02cdc21..697b287 100644
--- a/source3/rpc_server/lsa/srv_lsa_nt.c
+++ b/source3/rpc_server/lsa/srv_lsa_nt.c
@@ -1548,7 +1548,7 @@ NTSTATUS _lsa_OpenTrustedDomain(struct pipes_struct *p,
struct lsa_OpenTrustedDomain *r)
{
struct lsa_info *handle = NULL;
- struct trustdom_info *info;
+ struct trustdom_info *info = NULL;
NTSTATUS status;
if (!find_policy_by_hnd(p, r->in.handle, (void **)(void *)&handle)) {
@@ -1578,7 +1578,7 @@ NTSTATUS _lsa_OpenTrustedDomainByName(struct pipes_struct
*p,
struct lsa_OpenTrustedDomainByName *r)
{
struct lsa_info *handle = NULL;
- struct trustdom_info *info;
+ struct trustdom_info *info = NULL;
NTSTATUS status;
if (!find_policy_by_hnd(p, r->in.handle, (void **)(void *)&handle)) {
@@ -2827,7 +2827,7 @@ NTSTATUS _lsa_QuerySecurity(struct pipes_struct *p,
{
struct lsa_info *handle=NULL;
struct security_descriptor *psd = NULL;
- size_t sd_size;
+ size_t sd_size = 0;
NTSTATUS status;
/* find the connection policy handle. */
--
Samba Shared Repository
