1
0
mirror of https://github.com/samba-team/samba.git synced 2024-12-29 11:21:54 +03:00
Commit Graph

26614 Commits

Author SHA1 Message Date
Jeremy Allison
680975d07b Fix CID 606 - failed to return -1 after socket() fail.
Jeremy.
2008-10-29 16:43:19 -07:00
Jeremy Allison
35ef924f33 Fix CID 574 - tidies up the code expression.
Jeremy.
2008-10-29 16:28:57 -07:00
Jeremy Allison
f1a70d1e2a Coverity fix CID: 592 - null deref (can't happen but doesn't hurt to be sure).
Jeremy.
2008-10-29 16:02:45 -07:00
Jeremy Allison
a238144c6e Coverity fix #CID: 607 - resource leak on error path.
Jeremy.
2008-10-29 15:55:45 -07:00
Jeremy Allison
7c53ffea28 Allow a new file to inherit the Windows ACL from its parent.
Now to do the same for directories.
Jeremy.
2008-10-29 13:27:14 -07:00
Volker Lendecke
d1f980444d wbinfo --sid-to-fullname
Signed-off-by: Stefan Metzmacher <metze@samba.org>
2008-10-29 13:54:52 +01:00
Volker Lendecke
6aac05f5ce wbcGetDisplayName
Signed-off-by: Stefan Metzmacher <metze@samba.org>
2008-10-29 13:54:51 +01:00
Günther Deschner
5772c73e84 s3-build: re-run make samba3-idl.
Guenther
2008-10-29 08:57:53 +01:00
Günther Deschner
8be9cefd98 netlogon: merge netlogon.idl between s3 and s4.
Guenther
2008-10-29 08:57:53 +01:00
Günther Deschner
8e4c691c0a s4-netlogon: merge netr_ServerAuthenticate{2,3} from s3 idl.
Guenther
2008-10-29 08:57:51 +01:00
Günther Deschner
ef37351f18 s4-netlogon: merge netr_DatabaseSync2 from s3 idl.
Guenther
2008-10-29 08:57:51 +01:00
Günther Deschner
cbc0b63a77 s4-netlogon: merge netr_DatabaseSync from s3 idl.
Guenther
2008-10-29 08:57:51 +01:00
Günther Deschner
f285af6367 s4-netlogon: merge netr_LogonSamLogon{Ex,WithFlags} from s3 idl.
Guenther
2008-10-29 08:57:31 +01:00
Günther Deschner
bb3836a67f s4-smbtorture: fix test_LogonUasLogon.
Guenther
2008-10-28 23:40:44 +01:00
Günther Deschner
98f8f89164 s4-netlogon: merge misc stuff.
Guenther
2008-10-28 23:37:40 +01:00
Günther Deschner
698b7fd436 netapi: fix access bits in netapi.
Guenther
2008-10-28 00:13:50 +01:00
Günther Deschner
f5269ff182 s3-netlogon: kill an fstring in rpc_server.
Guenther
2008-10-28 00:13:50 +01:00
Jelmer Vernooij
35f12009af Merge branch 'master' of ssh://git.samba.org/data/git/samba 2008-10-27 23:41:48 +01:00
Jelmer Vernooij
aafe9ca1aa Fix definition of environ on Mac OS X (bugzilla: #5412). 2008-10-27 23:39:53 +01:00
Jelmer Vernooij
807b862bc9 Fix duplicate inclusion of zlib.m4. 2008-10-27 23:34:23 +01:00
Jelmer Vernooij
9de5172a20 Remove duplicate check for volatile, move all utime-checks to
libreplace.
2008-10-27 23:23:15 +01:00
Günther Deschner
d04131c8ec idl: share lsa.idl between s3 and s4.
Guenther
2008-10-27 19:33:23 +01:00
Günther Deschner
992c03a192 s4-lsa: merge lsa_LookupSids/{2,3} from s3 lsa idl.
Guenther
2008-10-27 19:33:23 +01:00
Günther Deschner
8bcc939a8c s4-lsa: merge lsa_LookupPrivName from s3 lsa idl.
Guenther
2008-10-27 19:33:22 +01:00
Günther Deschner
ea6b4865ea s4-lsa: merge lsa_EnumPrivsAccount from s3 lsa idl.
Guenther
2008-10-27 19:33:22 +01:00
Günther Deschner
95c69caef6 s4-lsa: merge lsa_LookupPrivDisplayName from s3 lsa idl.
Guenther
2008-10-27 19:33:22 +01:00
Günther Deschner
6131c0d888 s4-lsa: merge lsa_EnumTrustDom from s3 lsa idl.
Guenther
2008-10-27 19:33:22 +01:00
Günther Deschner
7e19dd6a0a s4-lsa: merge lsa_EnumAccounts from s3 lsa idl.
Guenther
2008-10-27 19:33:22 +01:00
Günther Deschner
fb38705e42 s4-lsa: merge lsa_EnumPrivs from s3 lsa idl.
Guenther
2008-10-27 19:33:22 +01:00
Günther Deschner
4ee7b58e0a s4-lsa: merge lsa_QuerySecurity from s3 lsa idl.
Guenther
2008-10-27 19:33:21 +01:00
Michael Adam
b881d2ee78 [s3]winbind: fix smbd hanging on Solaris when winbindd closes socket.
On some versions of Solaris, we observed a strange effect of close(2)
on a socket: After the server (here winbindd) called close, the client fd
was not marked as readable for select. And a write call to the fd did
not produce an error EPIPE but just returned as if successful.

So while winbindd had called remove_client(), the corresponding smbd
still thought that it was connected, but failed to retrieve answers
for its queries.

This patch works around the problem by forcing the client fd to
the readable state: Just write one byte into the socket before
closing.

Michael
2008-10-27 14:59:33 +01:00
Günther Deschner
68aa9bd67f s3-rpcclient: add getdcsitecoverage call.
Guenther
2008-10-27 14:29:04 +01:00
Günther Deschner
5a4b421952 s3-build: re-run make samba3-idl.
Guenther
2008-10-27 14:29:04 +01:00
Günther Deschner
eb3c826f7b s3-netlogon-idl: fix IDL for netr_DsrGetDcSiteCoverageW.
Guenther
2008-10-27 14:29:04 +01:00
Michael Adam
151dfd9dd1 [s3]build: fix bug #5765 - fix installlibs on solaris by using portable "test -r"
instead of test -e, which /bin/sh on solaris does not know.

Michael
2008-10-27 13:51:47 +01:00
Michael Adam
e4fe3320ec [s3]libsmbconf: add utility function smbconf_is_writeable_bystring()
This checks the writeability of a config source specified by the
config source name.

Michael
2008-10-27 13:02:41 +01:00
Michael Adam
3a06201086 [s3]libsmbconf: add method is_writeable() and wrapper smbconf_is_writeable()
This allows for per-config-source checking of write support.

Michael
2008-10-27 13:02:40 +01:00
Michael Adam
9c09d545bf [s3]libsmbconf: create text config in smbconftort
Michael
2008-10-27 13:02:40 +01:00
Michael Adam
b23106745c [s3]libsmbconf: return WERR_BADFILE when no path to text backend is provided.
Michael
2008-10-27 13:02:39 +01:00
Michael Adam
64ab71d2d7 [s3]libsmbconf: fall back to file backend when no valid backend was found
Interpret the source string as a file name when it contains
a ':' sign but the initial part is not a known backend.
This might occur even implicitly when "%T" is used in an
include file name (even though this is not realistic..).

Michael
2008-10-27 13:02:39 +01:00
Michael Adam
e453bf70c9 [s3]libsmbconf: fix comment typo.
Michael
2008-10-27 13:02:38 +01:00
Michael Adam
9299d53ef9 [s3]libsmbconf: add backend_requires_messaging() method to libsmbconf.
In a clustered environment, the registry backend needs messaging
to be set up since ctdb requires this.

Michael
2008-10-27 13:02:38 +01:00
Michael Adam
0ee8992331 [s3]libsmbconf: remove unused define.
Michael
2008-10-27 13:02:37 +01:00
Michael Adam
1d3dcd1e42 [s3]pidfile_create: use check is_default_dyn_CONFIGFILE() since we have it.
Michael
2008-10-27 13:02:37 +01:00
Michael Adam
268caef85e [s3]test: fix testparm_s3 tests: don't create truncated smb.conf files.
Use whole argument string in test_one_global_option(), not only first.

Michael
2008-10-27 13:02:36 +01:00
Michael Adam
65ca8eb3dd [s3]pdbedit: remove unused variable.
Note: The change of commit r21962 (or fe962d2e48, aka f540c18b2)
that was partly lost in the SVN->git glue commit e5a951325a
(aka 5c6c8e1fe9) is not needed any more since the handler
for option "-s" calls set_dyn_CONFIGFILE().

Michael
2008-10-27 13:02:36 +01:00
Michael Adam
1c6aa01e1f [s3]build: fix bug #5677 - fix test_{shlibs,nss_modules,pam_modules} on Solaris
and other systems where sh does not support "export FOO=bar"
by separating setting and exporting the variable.

Thanks to Yasuma Takeda <yasuma@osstech.co.jp> for the patch.

Michael
2008-10-27 13:02:35 +01:00
Volker Lendecke
7bea6684c2 Add proxied named pipe support
This is a central piece of the "merged build" thing: Forward named pipes from
samba3 to samba4. This patch is not finished yet, as we will have to forward
the smb-level authentication information to samba4, but I'm pushing this patch
already to demonstrate the implementation without clutter.

It adds an intermediate parameter

np:proxy = srvsvc samr winreg wkssvc ... and so on

that states which of the pipes should be forwarded to the s4 unix domain socket
DEFAULT. The parameter is intermediate because once we have a proper endpoint
mapper implementation, this information will be retrieved out of a database.

If anybody wants to try this, do the merged build and configure s4 with

server services = samba3_smb, rpc, nbt, wrepl, ldap, cldap, kdc, drepl
samba3:smbd = /data/inst/sbin/smbd

and s3 with

auth methods = guest netlogond
np:proxy = srvsvc samr winreg wkssvc netlogon ntlsa ntsvcs lsass lsarpc netdfs \
rpcecho initshutdown epmapper svcctl eventlog drsuapi

Then run rpcclient against samba4. It will fork s3, which authenticates against
s4, and then forwards the rpc requests to s4.

Volker
2008-10-25 15:42:51 +02:00
Volker Lendecke
f87219d6e6 Move the is_known_pipename check into np_open 2008-10-25 15:23:36 +02:00
Volker Lendecke
1ad54998a9 Add str_list_check[_ci] to s3's proto.h
Jelmer, when I include lib/util/util.h into some s3 file I get errors, this is
why I put those prototypes here as a workaround. Might be fixed differently
later.
2008-10-25 13:50:25 +02:00
Volker Lendecke
5616480514 Fix "make etags" -- the args list gets really long for s4 with the prefix 2008-10-25 13:33:21 +02:00
Volker Lendecke
ff211be696 Remove "pipe_handle_offset" -- pipes now use "struct files_struct" 2008-10-25 12:09:58 +02:00
Derrell Lipman
2a76f4d8c8 Error return is False, not -1
- There were a few places in SMBC_getatr() that returned -1 instead of a
  boolean.  -1 was intended to mean error, but that's what False is for, and
  the usages of this function assume that it returns a boolean with False as
  the error condition.

Derrell
2008-10-24 10:31:31 -04:00
Jelmer Vernooij
ea474647f8 Revert Samba3 back to using its own charset handling code. 2008-10-24 16:05:15 +02:00
Jelmer Vernooij
56a0b035c6 Remove more uses of global_loadparm. 2008-10-24 14:31:16 +02:00
Jelmer Vernooij
2cabbb2eeb Merge branch 'master' of ssh://git.samba.org/data/git/samba 2008-10-24 04:19:08 +02:00
Jelmer Vernooij
9d679c9a67 Fix merged build paths. 2008-10-24 04:18:47 +02:00
Tim Prouty
0058176ae3 s3: fix simple "incompatible pointer type" build warning 2008-10-23 16:38:19 -07:00
Tim Prouty
1b42152454 Fix "ndr_size_PAC_LOGON_INFO defined but not used" build warning
This patch removes the gensize option from krb5pac.idl because it
generates an unused function that has been causing warnings during the
s3 build.  I re-ran 'make samba3-idl' to update the generated files
for s3.  For s4 I ran a full build with no problems.
2008-10-23 15:13:54 -07:00
Günther Deschner
0bfbae0f50 netapi: make sure to always cleanup after testing NetUser calls.
Guenther
2008-10-24 00:06:43 +02:00
Günther Deschner
d27bc7377a netapi: add more group tests to netapitest.
Guenther
2008-10-24 00:06:33 +02:00
Günther Deschner
3971492301 s3-samr-server: return NT_STATUS_NOT_SUPPORTED for group rename.
Guenther
2008-10-24 00:06:24 +02:00
Günther Deschner
2b364550a9 s3-samr-server: remove unused historic code.
Guenther
2008-10-24 00:06:16 +02:00
Günther Deschner
78a85f9e96 svcctl: move some non-rpc related bits out of rpc_svcctl.h.
Guenther
2008-10-24 00:06:07 +02:00
Jelmer Vernooij
ce0ac322b4 Fix prototype for set_sockaddr_port. 2008-10-23 23:20:50 +02:00
Jelmer Vernooij
f18296151d Merge branch 'master' of ssh://git.samba.org/data/git/samba 2008-10-23 21:59:15 +02:00
Tim Prouty
0b68762af7 Fix "parameter has incomplete type" build warning.
When libcli-util was moved to the top level
(3be0f6ea56) it introduced a build
warning.  Since ndr_map_error2ntstatus depends on the definition of
enum ndr_err_code and libndr.h can't be easily included in error.h, I
moved the definition of enum ndr_err_code to libndr.h.

This also eliminates the need for the duplicate definition in proto.h
2008-10-23 12:21:44 -07:00
Jelmer Vernooij
22f566c39b Move set_sockaddr_port to libutil. 2008-10-23 21:08:13 +02:00
Jelmer Vernooij
7577d9ebf0 Merge branch 'master' of ssh://git.samba.org/data/git/samba 2008-10-23 20:42:30 +02:00
Jelmer Vernooij
fe36fe8c3e Use common net utility code (address and sockaddr manipulation). 2008-10-23 20:41:15 +02:00
Günther Deschner
27c4cf4e7b s3-build: add missing generated svcctl changes.
Guenther
2008-10-23 20:00:03 +02:00
Jelmer Vernooij
d6a5476ee7 Use sockaddr_storage only where we rely on the size, use sockaddr
otherwise (to clarify we can also pass in structs smaller than
sockaddr_storage, such as sockaddr_in).
2008-10-23 19:53:15 +02:00
Jelmer Vernooij
c17898db4e Merge branch 'master' of ssh://git.samba.org/data/git/samba 2008-10-23 18:50:34 +02:00
Jelmer Vernooij
81fabeff2d Use libutil genrand. 2008-10-23 18:46:35 +02:00
Günther Deschner
f36ffa7681 s3-build: remove duplicate svcctl bits and re-run make samba3-idl.
Guenther
2008-10-23 18:34:57 +02:00
Jelmer Vernooij
d805c714bb Merge branch 'master' of ssh://git.samba.org/data/git/samba 2008-10-23 17:51:30 +02:00
Volker Lendecke
097f40249c Make use of a large buffer for smbclient put command 2008-10-23 17:46:00 +02:00
Jelmer Vernooij
cf659fa4fe Import talloc_stack into util library. 2008-10-23 17:27:30 +02:00
Jelmer Vernooij
db65c3374a Merge branch 'master' of ssh://git.samba.org/data/git/samba 2008-10-23 17:12:16 +02:00
Jelmer Vernooij
5b5e36085a Share codepages. 2008-10-23 16:58:11 +02:00
Jelmer Vernooij
f9fb9436ae Use WERR_FILE_EXISTS which is the equivalent of WERR_ALREADY_EXISTS
previously present in Samba 3.
2008-10-23 15:37:39 +02:00
Jelmer Vernooij
44b728958a Use common error definitions. 2008-10-23 15:35:21 +02:00
Günther Deschner
8a3bff343a s3-build: fix another build warning with the new ASN1 code.
Guenther
2008-10-23 11:46:18 +02:00
Günther Deschner
b7c38abe27 netapi: fix add_GROUP_USERS_INFO_X_buffer.
Guenther
2008-10-23 11:46:18 +02:00
Günther Deschner
fafa608441 netapi: fix NetUserGetGroups_r returning partial results.
Guenther
2008-10-23 11:46:18 +02:00
Günther Deschner
6e058e5977 s3-samr-server: unify callback convention: _samr_UserSetInfo.
Guenther
2008-10-23 11:46:18 +02:00
Günther Deschner
3566efede2 s3-samr-server: unify callback convention: _samr_QueryDomainInfo.
Guenther
2008-10-23 11:46:18 +02:00
Günther Deschner
29737ab5da s3-samr-server: fix return code in _samr_QueryDisplayInformation.
Guenther
2008-10-23 11:46:18 +02:00
Jelmer Vernooij
60164e9002 Merge branch 'master' of ssh://git.samba.org/data/git/samba 2008-10-23 04:58:08 +02:00
Jelmer Vernooij
52923c4ff4 Remove unused copy of tables.pl 2008-10-23 03:07:27 +02:00
Jelmer Vernooij
ad50d78496 Remove unused copy of ndrdump.c. 2008-10-23 03:04:48 +02:00
Günther Deschner
d115c4587f s3-build: fix some const build warnings.
Guenther
2008-10-23 01:43:41 +02:00
Günther Deschner
c017909e2e netapi: NetGroupEnum_r needs to handle servers with no groups.
Guenther
2008-10-23 01:43:06 +02:00
Günther Deschner
74a9a391aa s3-samr-server: _samr_DeleteUser needs to wipe out the user_handle on success.
Guenther
2008-10-23 01:42:27 +02:00
Günther Deschner
f9c6313e66 s3-samr-server: fix access check in _samr_QuerySecurity().
Guenther
2008-10-22 23:17:02 +02:00
Günther Deschner
0f89871837 s3-build: fix the build.
Guenther
2008-10-22 22:45:04 +02:00
Jeremy Allison
f53578daf4 Fix net rpc vampire, based on an *amazing* piece of debugging work by "Cooper S. Blake" <the_analogkid@yahoo.com>.
"I believe I have found two bugs in the 3.2 code and one bug that
carried on to the 3.3 branch.  In the 3.2 code, everything is
located in the utils/net_rpc_samsync.c file.  What I believe is the
first problem is that fetch_database() is calling
samsync_fix_delta_array() with rid_crypt set to true, which means
the password hashes are unencrypted from the RID encryption.
However, I believe this call is redundant, and the corresponding
call for samdump has rid_crypt set to false.  So I think the
rid_crypt param should be false in fetch_database().

If you follow the code, it makes its way to sam_account_from_delta()
where the password hashes are decrypted a second time by calling
sam_pwd_hash().  I believe this is what is scrambling my passwords.

These methods were refactored somewhere in the 3.3 branch.  Now the
net_rpc_samsync.c class calls rpc_vampire_internals, which calls
libnet/libnet_samsync.c, which calls samsync_fix_delta_array() with
rid_crypt always set to false.  I think that's correct.  But the
second bug has carried through in the sam_account_from_delta()
function:

 208         if (memcmp(r->ntpassword.hash, zero_buf, 16) != 0) {
 209                 sam_pwd_hash(r->rid, r->ntpassword.hash, lm_passwd, 0);
 210                 pdb_set_lanman_passwd(account, lm_passwd, PDB_CHANGED);
 211         }
 212
 213         if (memcmp(r->lmpassword.hash, zero_buf, 16) != 0) {
 214                 sam_pwd_hash(r->rid, r->lmpassword.hash, nt_passwd, 0);
 215                 pdb_set_nt_passwd(account, nt_passwd, PDB_CHANGED);

If you look closely you'll see that the nt hash is going into the
lm_passwd variable and the decrypted value is being set in the lanman
hash, and the lanman hash is being decrypted and put into the nt hash
field.  So the LanMan and NT hashes look like they're being put in
the opposite fields."

Fix this by removing the rid_crypt parameter.
Jeremy.
2008-10-22 13:21:23 -07:00
Günther Deschner
c0cf457c85 s3-asn1: make all of s3 asn1 code do a proper asn1_init() first.
Guenther
2008-10-22 21:37:36 +02:00
Günther Deschner
527d797476 s3-asn1/spnego: use OIDs including dots.
Guenther
2008-10-22 21:37:36 +02:00
Günther Deschner
d9f1fff5b3 s3: use shared asn1 code.
Guenther
2008-10-22 21:37:36 +02:00
Günther Deschner
cef97c2459 s3-spnego: move spnego defines to spnego.h
Guenther
2008-10-22 21:37:36 +02:00
Volker Lendecke
6c019b8755 Slightly simplify reply_sesssetup_blob(): Remove an else branch 2008-10-22 17:53:22 +02:00
Volker Lendecke
84df0a6870 Don't push the data out to the client in reply_sesssetup_blob()
Sending the data at this level breaks the assumption at higher levels that
req->outbuf == NULL means this request is deferred. It also breaks potential
chaining (Kerberos session setup and tcon X in one request)
2008-10-22 17:53:22 +02:00
Jelmer Vernooij
ca2d23e048 Remove unused header file. 2008-10-22 17:00:49 +02:00
Volker Lendecke
b8b0274e03 Fix a debug message in send_nt_replies() 2008-10-22 16:15:04 +02:00
Volker Lendecke
f4e760faf9 Fix bug 5840: Segfault in "rpcclient lsaaddacctrights" 2008-10-22 14:31:40 +02:00
Jelmer Vernooij
e16e6e9cb0 Use standard types. 2008-10-22 03:41:24 +02:00
Jeremy Allison
4e9db0b100 Cope with MAXIMUM_ALLOWED_ACCESS requests when opening handles.
Jeremy.
2008-10-21 18:05:48 -07:00
Jelmer Vernooij
f36e51617c Don't include a (relative path) srcdir in samba4-data.mk. 2008-10-21 18:49:43 +02:00
Jelmer Vernooij
8ac2da0d09 Allow running individual tests in the testsuite, normalize test names, fix some tests. 2008-10-21 18:26:46 +02:00
Jelmer Vernooij
e422f638bc Use socket wrapper for selftest.pl, find binaries correctly. 2008-10-21 17:48:05 +02:00
Jelmer Vernooij
fe02004865 Specify skip list to selftest.pl, make make target depend on test
binaries.
2008-10-21 17:32:07 +02:00
Jelmer Vernooij
ecd293325c Correctly report when merged-build is used in developer mode. 2008-10-21 17:23:48 +02:00
Jelmer Vernooij
59a6e534cd Merge branch 'selftest' of git://git.samba.org/jelmer/samba 2008-10-21 17:19:23 +02:00
Jelmer Vernooij
d53ff689a3 Silence undefined variable warnings. 2008-10-21 16:45:09 +02:00
Jelmer Vernooij
8fe59b9b00 Automatically enable merged build (for more complete 'make test') when possible during developer builds. 2008-10-21 16:04:54 +02:00
Jelmer Vernooij
3678a98dcd Remove duplicate searching of Samba 4 directory for tags. 2008-10-21 16:03:45 +02:00
Volker Lendecke
5cc4a84583 Fix two trivial typos 2008-10-21 15:29:40 +02:00
Andreas Schneider
24837959ed Create a function out of pam_sm_close_session to delete the credentials.
This is the way the creds should be deleted. Now we have back a
close_session function which can be used for other things.
2008-10-21 15:26:39 +02:00
Andreas Schneider
e858cc2083 Delete the krb5 ccname variable from the PAM environment if set.
If winbind sets the KRB5CCNAME variable it should unset it when
the cache gets destroyed.
2008-10-21 15:26:39 +02:00
Andreas Schneider
95b13b313b Set the right return value if wbc_status is set to an error. 2008-10-21 15:26:39 +02:00
Günther Deschner
9f46669871 s3-build: fix the build.
Guenther
2008-10-21 12:26:58 +02:00
Günther Deschner
b11f3a60fd s3-lsa-server: fix _lsa_GetUserName.
Guenther
2008-10-21 11:39:45 +02:00
Jeremy Allison
f0b1a1bc9b Remove the requirement for ldap call made as root. Add in security
checks for all SAMR calls.
Jeremy.
2008-10-20 16:51:37 -07:00
Jeremy Allison
29c9b88e2b Merge branch 'master' of ssh://jra@git.samba.org/data/git/samba 2008-10-20 16:38:25 -07:00
Jeremy Allison
6aba351676 Fix warnings.
Jeremy.
2008-10-20 16:34:56 -07:00
Günther Deschner
cefe4c6697 s3-rpcclient: fix cmd_lsa build.
Guenther
2008-10-20 22:09:07 +02:00
Günther Deschner
66b06e5a7f s3-build: re-run make samba3-idl.
Guenther
2008-10-20 22:09:07 +02:00
Günther Deschner
bb36f3a342 idl: merge from s4 lsa.idl to s3.
Guenther
2008-10-20 22:09:07 +02:00
Jelmer Vernooij
d36edccc00 Merge branch 'master' of git://git.samba.org/samba
Conflicts:
	source3/include/proto.h
2008-10-20 21:35:10 +02:00
Jelmer Vernooij
2c1b1255c2 Add source4/ to include path because librpc/gen_ndr is still in source?/ 2008-10-20 21:33:41 +02:00
Volker Lendecke
bc9bbda8b3 Fix a valgrind error in idmap_ad_sids_to_unixids()
We need to initialize all mappings in case we don't find anything.

Simo, please check!

Volker
2008-10-20 21:08:20 +02:00
Günther Deschner
f3843e330f s3-samr-server: be consistent when reporting we do password complexity.
Guenther
2008-10-20 20:16:03 +02:00
Jelmer Vernooij
7498f9a9d8 Add missing prototypes for samba3-specific libndr/util.c 2008-10-20 19:51:07 +02:00
Günther Deschner
4b59ecb903 s3-build: no need to duplicate generated ndr_ prototypes.
Guenther
2008-10-20 19:47:00 +02:00
Günther Deschner
c3f3271b82 s3-build: no need to duplicate generated srv_ prototypes.
Guenther
2008-10-20 19:46:44 +02:00
Jelmer Vernooij
d59b2472f4 Include generated header files rather than using manually written
prototypes.
2008-10-20 19:35:55 +02:00
Jelmer Vernooij
4a8c05a91b Remove unused macro CONST_ADD. 2008-10-20 16:52:00 +02:00
Jelmer Vernooij
05a0ccadb0 Remove unused define for crypt (now in libreplace). 2008-10-20 16:46:19 +02:00
Jelmer Vernooij
5424c68b3d Add missing asn1 object. 2008-10-20 13:21:29 +02:00
Jelmer Vernooij
e0905c3090 Use tables in Samba 3 ndrdump. 2008-10-20 13:19:39 +02:00
Jelmer Vernooij
6fb7fa8cc6 Also build all other Samba 4 binaries during merged build. 2008-10-20 12:28:07 +02:00
Jelmer Vernooij
d78f3be238 Merge branch 'master' of ssh://git.samba.org/data/git/samba into crypt 2008-10-20 12:19:57 +02:00
Jelmer Vernooij
a8707a43d0 Regenerate pidl output. 2008-10-20 12:19:01 +02:00
Jelmer Vernooij
5b52964b15 Share winreg.idl. 2008-10-20 11:53:20 +02:00
Jelmer Vernooij
8834b9c787 Merge branch 'master' of ssh://git.samba.org/data/git/samba into selftest 2008-10-20 11:33:44 +02:00
Günther Deschner
640847b4fc s3: forgot to remove old copy of krb5pac.idl.
Guenther
2008-10-20 11:21:45 +02:00
Günther Deschner
fc8fadf1e9 idl: finally share krb5_pac.idl.
Guenther
2008-10-20 11:11:22 +02:00
Jelmer Vernooij
70eba79edb Merge branch 'master' of ssh://git.samba.org/data/git/samba into selftest 2008-10-20 11:07:38 +02:00
Volker Lendecke
2883c88ae4 Fix nonempty blank lines 2008-10-19 21:51:17 +02:00
Volker Lendecke
48d3a1d2fb "fn_new"->"fn" in smb_messages[], we got beyond that :-) 2008-10-19 21:51:17 +02:00
Volker Lendecke
1510b7b8c9 Use a direct compare instead of calling strncmp in valid_smb_header 2008-10-19 21:51:16 +02:00
Volker Lendecke
ac647d03ac Move the global hosts_allow() check out of the processing loop 2008-10-19 21:51:16 +02:00
Kai Blin
c88cbbfdf3 vlp: Move closer to the code tested. 2008-10-19 15:03:22 +02:00
Jelmer Vernooij
86576f0f16 Add 'selftest' target to Samba 3 that uses the perl selftest code. 2008-10-19 14:56:29 +02:00
Jelmer Vernooij
6ba693b5de Make sure crypt libs get included. 2008-10-19 14:54:16 +02:00
Jelmer Vernooij
e09c0c1185 Merge branch 'master' of ssh://git.samba.org/data/git/samba into crypt 2008-10-19 14:27:08 +02:00
Jelmer Vernooij
7f826373db Move smb.conf parser to libutil to match Samba 4. 2008-10-19 14:03:20 +02:00
Jelmer Vernooij
55a88210d8 Add vlp to TORTURE_PROGS since it's required by "make test". 2008-10-19 13:35:37 +02:00
Jelmer Vernooij
99f0d6b1c1 Merge branch 'master' of ssh://git.samba.org/data/git/samba 2008-10-19 13:20:55 +02:00
Jelmer Vernooij
f0c4829e82 Remove silly safe_free() function which is a wrapper around SAFE_FREE().
Since it's a function it just sets the local pointer to NULL and basically
is an equivalent to free().

It also claims it's being used for callbacks but isn't used that way
anywhere.
2008-10-19 13:06:14 +02:00
Jelmer Vernooij
9fec173b07 Merge branch 'master' of ssh://git.samba.org/data/git/samba into strhex 2008-10-19 12:39:37 +02:00
Jelmer Vernooij
8e704e4107 Move more functions out of util_str.c into the shared util.c. 2008-10-19 12:38:16 +02:00
Volker Lendecke
ded09b28de Inline the once-used macro "init_dfsroot" 2008-10-19 11:36:32 +02:00
Jelmer Vernooij
7af7935d0e Specify ZLIB_LIBS explicitly in case zlib isn't brought in any other way. 2008-10-19 11:22:19 +02:00
Jelmer Vernooij
2fc058bdb0 Make generate_random_buffer signature match that of lib/util. 2008-10-19 10:16:21 +02:00
Jelmer Vernooij
7275952568 Add TALLOC_CTX pointer to generate_random_str(), for consistency with
Samba 4.
2008-10-19 10:05:48 +02:00
Jelmer Vernooij
b1a1fbcbfb Remove defines for QSORT_CAST, already provided by libreplace. 2008-10-19 09:53:18 +02:00
Jelmer Vernooij
0742635355 Simplify SIG_ATOMIC_T define, since sig_atomic_t is always provided by
libreplace.
2008-10-19 09:51:26 +02:00
Jelmer Vernooij
5380d43d3b Remove duplicate macro definitions (already defined in libutil/attr.h) 2008-10-19 09:47:45 +02:00
Günther Deschner
044bb5ce39 s3-build: re-run make samba3-idl.
Guenther
2008-10-19 00:26:16 +02:00
Günther Deschner
f34b6bfe34 idl: share drsblobs idl.
Guenther
2008-10-18 23:54:49 +02:00
Günther Deschner
80af41b5ea drsuapi: build new merged drsuapi idl and helpers.
Guenther
2008-10-18 23:25:58 +02:00
Günther Deschner
d413e1f40a drsuapi: share drsuapi idl and helper code.
Guenther
2008-10-18 23:25:48 +02:00
Günther Deschner
9289537c90 s3-build: fix the build of smbd.
Guenther
2008-10-18 21:45:49 +02:00
Jelmer Vernooij
2c5221ef7a Use attr.h rather than having local defines for GCC attributes. 2008-10-18 18:50:37 +02:00
Jelmer Vernooij
33032d591f Move ufc to libreplace. 2008-10-18 17:49:41 +02:00
Jelmer Vernooij
f3f9446ec1 Rename hex_encode to hex_encode_talloc,for consistency with samba 4 and heimdal. 2008-10-18 16:16:57 +02:00
Jelmer Vernooij
89c9545430 Use str_list_equal() rather than str_list_compare(). 2008-10-18 15:56:07 +02:00
Michael Adam
339925f98d [s3]loadparm: remove param/params.c which is used no more.
Michael
2008-10-18 15:36:18 +02:00
Michael Adam
7f5a94cf12 [s3]build: use ..lib/util/params.c instead of param/params.c
Michael
2008-10-18 15:36:17 +02:00
Michael Adam
ef9ccf5d20 [s3]test_lp_load: fix "no talloc stackframe around" message
gfree_loadparm() and TALLOC_FREE(frame) were in the wron order.

Michael
2008-10-18 15:36:17 +02:00
Michael Adam
15f0a4eadb [s3]testparm: prevent "no stackframe around" warning.
gfree_loadparm and TALLOC_FREE(frame) were in the wrong order.

Michael
2008-10-18 15:36:16 +02:00
Jelmer Vernooij
b3b6d8f3f9 Fix const, dupes. 2008-10-18 15:00:18 +02:00
Jelmer Vernooij
593549fc00 Fix build of 'everything' 2008-10-18 14:28:48 +02:00
Jelmer Vernooij
2d89b52be8 Use separate make variables for libutil and libcrypto. 2008-10-18 14:28:40 +02:00
Jelmer Vernooij
519458a2fa Use shared util.c. 2008-10-18 14:27:13 +02:00
Jelmer Vernooij
93310970e3 s3: Fix make clean 2008-10-18 14:19:55 +02:00
Jelmer Vernooij
842ea427bc Use standard va_copy. 2008-10-18 14:15:33 +02:00
Jelmer Vernooij
4083247a48 Remove empty file. 2008-10-18 14:15:29 +02:00
Jelmer Vernooij
dea4db9611 Remove obsolete comment about bool. 2008-10-18 14:15:25 +02:00
Jelmer Vernooij
fb1a93e666 Remove defines already provided by the system or libreplace. 2008-10-18 14:15:20 +02:00
Jelmer Vernooij
9d9f5b44ed Use common detection function for zlib. 2008-10-18 14:14:44 +02:00
Jelmer Vernooij
3189d14152 Use the new memory macro file from Samba 3. 2008-10-18 14:07:51 +02:00
Jeremy Allison
7c94c874c4 Unify access checks for lsa server functions.
Jeremy.
2008-10-17 15:24:15 -07:00
Günther Deschner
ef8f3c0e56 s3-build: cleanup in ../librpc as well on "make clean".
Guenther
2008-10-17 23:46:53 +02:00
Günther Deschner
d7264320f4 s3-build: re-run make samba3-idl.
Guenther
2008-10-17 23:02:11 +02:00
Günther Deschner
82aeb52ec0 s3-winreg: merge from s4 winreg idl.
Guenther
2008-10-17 23:02:02 +02:00
Günther Deschner
6503ffaa04 s3: fix s3 drsuapi callers.
Guenther
2008-10-17 10:54:01 +02:00
Günther Deschner
bd07fdcebe s3-build: re-run make samba3-idl.
Guenther
2008-10-17 10:54:01 +02:00
Günther Deschner
d2a007b629 s3: merge from s4 drsuapi.idl.
Guenther
2008-10-17 10:54:01 +02:00
Jeremy Allison
c783d8a32e Cope with bad trans2mkdir requests from System i QNTC IBM SMB client.
If total_data == 4 Windows doesn't care what values
are placed in that field, it just ignores them.
The System i QNTC IBM SMB client puts bad values here,
so ignore them.
Jeremy.
2008-10-16 21:03:59 -07:00
Jeremy Allison
6f77607047 Fix bug 5826 - Directory/Filenames get truncated when 3.2.0 client acesses old server.
There was some code in pull_ucs2_base_talloc() to cope with this case which
hadn't been added to pull_ascii_base_talloc(). The older Samba returns non
unicode names which is why you are seeing this codepath being executed.

Unify the logic in pull_ascii_base_talloc() and pull_ucs2_base_talloc().
Jeremy.
2008-10-16 15:40:57 -07:00
Günther Deschner
f0dcc1fad4 s4-build: fix drsuapi callers.
Guenther
2008-10-16 14:03:10 +02:00
Günther Deschner
f0dccc0307 s3: re-merge s4 drsuapi helper and re-run make samba3-idl.
Guenther
2008-10-16 14:02:26 +02:00
Günther Deschner
04a676f9a4 s3-idl: merge from s4 drsuapi.idl.
Guenther
2008-10-16 14:00:42 +02:00
Günther Deschner
e31b9e0f66 s3: remove old marshalling for SVCCTL_QUERY_SERVICE_CONFIG.
Guenther
2008-10-16 09:54:50 +02:00
Günther Deschner
6a97b4147c s3: use IDL generated rpc for _svcctl_QueryServiceConfigW.
Guenther
2008-10-16 09:54:49 +02:00
Günther Deschner
d2b836e19a s3: remove rpccli_svcctl_query_config.
Guenther
2008-10-16 09:54:49 +02:00
Günther Deschner
9571a182f1 s3-build: re-run make samba3-idl.
Guenther
2008-10-16 09:54:49 +02:00
Jeremy Allison
969a2fc4dd Don't use debug level 1 to log a trivial message.
Jeremy.
2008-10-15 18:07:15 -07:00
Günther Deschner
42a8de780b s3: fix s3 winreg server after idl changes.
Guenther
2008-10-15 21:45:05 +02:00
Günther Deschner
1e7e508e49 s3-build: re-run make samba3-idl after winreg changes.
Guenther
2008-10-15 21:45:05 +02:00
Günther Deschner
d242491488 idl: finally fully share nbt.idl in s3 and s4.
Guenther
2008-10-15 21:44:39 +02:00
Günther Deschner
e9e1246021 kerberos: fix some heimdal build warnings.
Guenther
2008-10-15 21:43:50 +02:00
Günther Deschner
a1b7b6d5b4 idl: more lsa.idl merges.
Guenther
2008-10-15 20:46:35 +02:00
Günther Deschner
df7a89adb7 s3: fix s3 lsa server.
Guenther
2008-10-15 19:44:49 +02:00
Günther Deschner
018bf57c27 s3-build: re-run make samba3-idl.
Guenther
2008-10-15 19:44:48 +02:00
Günther Deschner
f64f444c96 s3: merge some more lsa bits from s4 idl.
Guenther
2008-10-15 19:44:40 +02:00
Jelmer Vernooij
ada0e343b2 Sync parameter names with samba 3. 2008-10-15 17:38:51 +02:00
Jelmer Vernooij
fed4658c1b winreg.idl: Sync ref change from Samba 3. 2008-10-15 17:34:55 +02:00
Günther Deschner
65dc1eeceb s3: fix various samr callers.
Guenther
2008-10-15 17:11:27 +02:00
Günther Deschner
911501bb8b s3-build: re-run make samba3-idl.
Guenther
2008-10-15 17:11:27 +02:00
Günther Deschner
a26dde5b1c s3: merge from s4 samr.idl.
Guenther
2008-10-15 17:11:27 +02:00
Jelmer Vernooij
b41fc6c729 Re-run pidl. 2008-10-15 16:54:28 +02:00
Jelmer Vernooij
d210393639 lsa.idl: Sync a couple more constants from Samba 4. 2008-10-15 16:54:01 +02:00
Jelmer Vernooij
5390dc0d24 Share wkssvc.idl. 2008-10-15 16:48:53 +02:00
Jelmer Vernooij
85c36cb2cd Share eventlog.idl. 2008-10-15 16:37:27 +02:00
Jelmer Vernooij
5d408ccf83 Rename reboot -> do_reboot since the first is a reserved name on FreeBSD. 2008-10-15 16:25:06 +02:00
Jelmer Vernooij
310dc3e42d Re-run pidl. 2008-10-15 16:16:26 +02:00
Jelmer Vernooij
ec63a6f5ad Merge branch 'master' of git://git.samba.org/samba 2008-10-15 16:16:01 +02:00
Jelmer Vernooij
3214fb0734 Add [public] and [todo] as in Samba 4. 2008-10-15 16:15:20 +02:00
Günther Deschner
3b9a03a7c3 s3: fix samlogon client and server calls.
Guenther
2008-10-15 16:14:20 +02:00
Günther Deschner
bf38baba6d s3-build: re-run make samba3-idl.
Guenther
2008-10-15 16:14:20 +02:00
Günther Deschner
9b162bd3a9 idl: merge netlogon IDL between s3 and s4 wrt LogonSamLogon.
Guenther
2008-10-15 16:14:19 +02:00
Jelmer Vernooij
881b36f4cf Share initshutdown.idl. 2008-10-15 16:13:02 +02:00
Jelmer Vernooij
0c840bd8d2 Share xattr implementation. 2008-10-15 15:57:39 +02:00
Jelmer Vernooij
760dfa76d9 Share epmapper. 2008-10-15 15:31:49 +02:00
Jelmer Vernooij
78ad8fc8aa Merge branch 'master' of git://git.samba.org/samba 2008-10-15 15:18:26 +02:00
Jelmer Vernooij
17e9d49915 Fix include flags for merged build. 2008-10-15 15:17:31 +02:00
Günther Deschner
b54b8912e1 s3-build: re-run make samba3-idl.
Guenther
2008-10-15 15:14:46 +02:00
Günther Deschner
94d7e52dd8 idl: more netlogon merges between s3 and s4.
Guenther
2008-10-15 15:14:00 +02:00
Günther Deschner
f0fd834141 share ntsvcs.idl.
Guenther
2008-10-15 12:03:12 +02:00
Günther Deschner
fe46368e09 move svcctl to main idl directory.
Guenther
2008-10-15 11:37:42 +02:00
Günther Deschner
d9070ab7bc s3-build: add regenerated files.
Guenther
2008-10-15 11:28:55 +02:00
Günther Deschner
3cb281e48f s3-libgpo: fix build for security cse.
Guenther
2008-10-15 11:28:43 +02:00
Günther Deschner
6afcd9e1bc s3-build: fix make samba3-idl.
Guenther
2008-10-15 11:28:32 +02:00
Jelmer Vernooij
d6e5204807 Merge branch 'master' of git://git.samba.org/samba 2008-10-15 02:54:39 +02:00
Jelmer Vernooij
4695504a6c Share security.idl. 2008-10-15 02:33:16 +02:00
Tim Prouty
16bbfc2262 Fixed "argument differ in signedness" warning on linux 2008-10-14 17:31:07 -07:00