[SCM] Samba Shared Repository - branch v3-2-test updated -
initial-v3-2-test-2553-ge670135
Günther Deschner
gd at samba.org
Wed Feb 27 16:21:16 GMT 2008
The branch, v3-2-test has been updated
via e6701352dc2cd4ff9cc7d04db6f1975594477cdb (commit)
via 2ebfd28cf73a63ccf595775853e9b1660a43fd20 (commit)
via 6c6455157317049d65a9012f4e339b7e86fb0af6 (commit)
via 44e63dbac990333878cda4f1a16634496ba47d0e (commit)
via 618eae4c0cd6a68349a76cdf36f281733fb472ae (commit)
from 9e7d32e28ce40ff158f3705354e8673f99b462bc (commit)
http://gitweb.samba.org/?samba.git;a=shortlog;h=v3-2-test
- Log -----------------------------------------------------------------
commit e6701352dc2cd4ff9cc7d04db6f1975594477cdb
Author: Günther Deschner <gd at samba.org>
Date: Wed Feb 27 16:54:01 2008 +0100
Remove unneeded rpc_samr.h.
Guenther
commit 2ebfd28cf73a63ccf595775853e9b1660a43fd20
Author: Günther Deschner <gd at samba.org>
Date: Wed Feb 27 17:15:09 2008 +0100
Re-run make idl.
Guenther
commit 6c6455157317049d65a9012f4e339b7e86fb0af6
Author: Günther Deschner <gd at samba.org>
Date: Wed Feb 27 16:52:39 2008 +0100
Move MAX_SAM_ENTRIES defines to samr rpc_server and to samr.idl.
Guenther
commit 44e63dbac990333878cda4f1a16634496ba47d0e
Author: Günther Deschner <gd at samba.org>
Date: Wed Feb 27 17:14:22 2008 +0100
Re-run make idl.
Guenther
commit 618eae4c0cd6a68349a76cdf36f281733fb472ae
Author: Günther Deschner <gd at samba.org>
Date: Wed Feb 27 16:49:44 2008 +0100
Move PASS_*_CHANGE_AT_NEXT_LOGON defines to samr.idl.
Guenther
-----------------------------------------------------------------------
Summary of changes:
source/include/includes.h | 1 -
source/include/rpc_samr.h | 89 ---------------------------------------
source/librpc/gen_ndr/samr.h | 4 ++
source/librpc/idl/samr.idl | 8 ++++
source/rpc_server/srv_samr_nt.c | 2 +
5 files changed, 14 insertions(+), 90 deletions(-)
delete mode 100644 source/include/rpc_samr.h
Changeset truncated at 500 lines:
diff --git a/source/include/includes.h b/source/include/includes.h
index 02edbb0..a2c3a0c 100644
--- a/source/include/includes.h
+++ b/source/include/includes.h
@@ -698,7 +698,6 @@ typedef char fstring[FSTRING_LEN];
#include "rpc_netlogon.h"
#include "reg_objects.h"
#include "reg_db.h"
-#include "rpc_samr.h"
#include "rpc_srvsvc.h"
#include "rpc_spoolss.h"
#include "rpc_eventlog.h"
diff --git a/source/include/rpc_samr.h b/source/include/rpc_samr.h
deleted file mode 100644
index cf60279..0000000
--- a/source/include/rpc_samr.h
+++ /dev/null
@@ -1,89 +0,0 @@
-/*
- Unix SMB/CIFS implementation.
- SMB parameters and setup
- Copyright (C) Andrew Tridgell 1992-2000
- Copyright (C) Luke Kenneth Casson Leighton 1996-2000
- Copyright (C) Paul Ashton 1997-2000
- Copyright (C) Jean François Micouleau 1998-2001
- Copyright (C) Jim McDonough <jmcd at us.ibm.com> 2002
-
-
- 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 _RPC_SAMR_H /* _RPC_SAMR_H */
-#define _RPC_SAMR_H
-
-/*******************************************************************
- the following information comes from a QuickView on samsrv.dll,
- and gives an idea of exactly what is needed:
-
-x SamrAddMemberToAlias
-x SamrAddMemberToGroup
-SamrAddMultipleMembersToAlias
-x SamrChangePasswordUser
-x SamrCloseHandle
-x SamrConnect
-x SamrCreateAliasInDomain
-x SamrCreateGroupInDomain
-x SamrCreateUserInDomain
-? SamrDeleteAlias
-SamrDeleteGroup
-x SamrDeleteUser
-x SamrEnumerateAliasesInDomain
-SamrEnumerateDomainsInSamServer
-x SamrEnumerateGroupsInDomain
-x SamrEnumerateUsersInDomain
-SamrGetUserDomainPasswordInformation
-SamrLookupDomainInSamServer
-? SamrLookupIdsInDomain
-x SamrLookupNamesInDomain
-x SamrOpenAlias
-x SamrOpenDomain
-x SamrOpenGroup
-x SamrOpenUser
-x SamrQueryDisplayInformation
-x SamrQueryInformationAlias
-SamrQueryInformationDomain
-? SamrQueryInformationUser
-x SamrQuerySecurityObject
-SamrRemoveMemberFromAlias
-SamrRemoveMemberFromForiegnDomain
-SamrRemoveMemberFromGroup
-SamrRemoveMultipleMembersFromAlias
-x SamrSetInformationAlias
-SamrSetInformationDomain
-x SamrSetInformationGroup
-x SamrSetInformationUser
-SamrSetMemberAttributesOfGroup
-SamrSetSecurityObject
-SamrShutdownSamServer
-SamrTestPrivateFunctionsDomain
-SamrTestPrivateFunctionsUser
-
-********************************************************************/
-
-#define PASS_MUST_CHANGE_AT_NEXT_LOGON 0x01
-#define PASS_DONT_CHANGE_AT_NEXT_LOGON 0x00
-
-#define MAX_SAM_ENTRIES_W2K 0x400
-#define MAX_SAM_ENTRIES_W95 50
-/* The following should be the greater of the preceeding two. */
-#define MAX_SAM_ENTRIES MAX_SAM_ENTRIES_W2K
-
-/* these are from the old rpc_samr.h - they are needed while the merge
- is still going on */
-#define MAX_SAM_SIDS 15
-
-#endif /* _RPC_SAMR_H */
diff --git a/source/librpc/gen_ndr/samr.h b/source/librpc/gen_ndr/samr.h
index dff4bf8..700c462 100644
--- a/source/librpc/gen_ndr/samr.h
+++ b/source/librpc/gen_ndr/samr.h
@@ -8,7 +8,11 @@
#ifndef _HEADER_samr
#define _HEADER_samr
+#define MAX_SAM_ENTRIES_W2K ( 0x400 )
+#define MAX_SAM_ENTRIES_W95 ( 50 )
#define SAMR_ENUM_USERS_MULTIPLIER ( 54 )
+#define PASS_MUST_CHANGE_AT_NEXT_LOGON ( 0x01 )
+#define PASS_DONT_CHANGE_AT_NEXT_LOGON ( 0x00 )
/* bitmap samr_AcctFlags */
#define ACB_DISABLED ( 0x00000001 )
#define ACB_HOMDIRREQ ( 0x00000002 )
diff --git a/source/librpc/idl/samr.idl b/source/librpc/idl/samr.idl
index ebd1975..ac0934d 100644
--- a/source/librpc/idl/samr.idl
+++ b/source/librpc/idl/samr.idl
@@ -316,6 +316,10 @@ import "misc.idl", "lsa.idl", "security.idl";
/************************/
/* Function 0x0b */
+
+ const int MAX_SAM_ENTRIES_W2K = 0x400; /* 1024 */
+ const int MAX_SAM_ENTRIES_W95 = 50;
+
NTSTATUS samr_EnumDomainGroups(
[in] policy_handle *domain_handle,
[in,out,ref] uint32 *resume_handle,
@@ -779,6 +783,10 @@ import "misc.idl", "lsa.idl", "security.idl";
SAMR_FIELD_OWF_PWD = 0x20000000
} samr_FieldsPresent;
+ /* used for 'password_expired' in samr_UserInfo21 */
+ const int PASS_MUST_CHANGE_AT_NEXT_LOGON = 0x01;
+ const int PASS_DONT_CHANGE_AT_NEXT_LOGON = 0x00;
+
typedef struct {
NTTIME last_logon;
NTTIME last_logoff;
diff --git a/source/rpc_server/srv_samr_nt.c b/source/rpc_server/srv_samr_nt.c
index df7bb9b..8289440 100644
--- a/source/rpc_server/srv_samr_nt.c
+++ b/source/rpc_server/srv_samr_nt.c
@@ -876,6 +876,8 @@ static NTSTATUS make_user_sam_entry_list(TALLOC_CTX *ctx,
return NT_STATUS_OK;
}
+#define MAX_SAM_ENTRIES MAX_SAM_ENTRIES_W2K
+
/*******************************************************************
_samr_EnumDomainUsers
********************************************************************/
--
Samba Shared Repository
More information about the samba-cvs
mailing list