[SCM] Samba Shared Repository - branch master updated
Jeremy Allison
jra at samba.org
Fri Feb 24 15:11:05 MST 2012
The branch, master has been updated
via c9ef087 Fix const warnings.
via 0e6213b Remove unused function.
from 61953ab s3: Simplify smb_splice_chain
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit c9ef08772214f1eab545b7ca5e0cb5bdbf8dd6ce
Author: Jeremy Allison <jra at samba.org>
Date: Thu Feb 23 14:49:02 2012 -0800
Fix const warnings.
Autobuild-User: Jeremy Allison <jra at samba.org>
Autobuild-Date: Fri Feb 24 23:10:56 CET 2012 on sn-devel-104
commit 0e6213b1aeb0243dc5f1e2d989a621a76dc621aa
Author: Jeremy Allison <jra at samba.org>
Date: Thu Feb 23 14:46:45 2012 -0800
Remove unused function.
-----------------------------------------------------------------------
Summary of changes:
source3/smbd/close.c | 4 ++--
source3/utils/net_util.c | 21 ---------------------
2 files changed, 2 insertions(+), 23 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/smbd/close.c b/source3/smbd/close.c
index 1a123b4..34ce785 100644
--- a/source3/smbd/close.c
+++ b/source3/smbd/close.c
@@ -158,8 +158,8 @@ static NTSTATUS close_filestruct(files_struct *fsp)
static int compare_share_mode_times(const void *p1, const void *p2)
{
- struct share_mode_entry *s1 = (struct share_mode_entry *)p1;
- struct share_mode_entry *s2 = (struct share_mode_entry *)p2;
+ const struct share_mode_entry *s1 = (const struct share_mode_entry *)p1;
+ const struct share_mode_entry *s2 = (const struct share_mode_entry *)p2;
return timeval_compare(&s1->time, &s2->time);
}
diff --git a/source3/utils/net_util.c b/source3/utils/net_util.c
index d0f2dd7..4c818f2 100644
--- a/source3/utils/net_util.c
+++ b/source3/utils/net_util.c
@@ -220,27 +220,6 @@ NTSTATUS connect_to_ipc_anonymous(struct net_context *c,
}
}
-/****************************************************************************
- Return malloced user at realm for krb5 login.
-****************************************************************************/
-
-static char *get_user_and_realm(const char *username)
-{
- char *user_and_realm = NULL;
-
- if (!username) {
- return NULL;
- }
- if (strchr_m(username, '@')) {
- user_and_realm = SMB_STRDUP(username);
- } else {
- if (asprintf(&user_and_realm, "%s@%s", username, lp_realm()) == -1) {
- user_and_realm = NULL;
- }
- }
- return user_and_realm;
-}
-
/**
* Connect a server and open a given pipe
*
--
Samba Shared Repository
More information about the samba-cvs
mailing list