1
0
mirror of https://github.com/samba-team/samba.git synced 2025-01-11 05:18:09 +03:00
Commit Graph

96 Commits

Author SHA1 Message Date
Jelmer Vernooij
d1bc7e56d0 Rename same_net to same_net_v4 for consistency with Samba 3. 2008-10-23 19:56:09 +02:00
Jelmer Vernooij
d70efa57ce Merge branch 'master' of git://git.samba.org/samba
Conflicts:
	lib/util/asn1_proto.h
2008-10-23 18:04:16 +02:00
Jelmer Vernooij
2f265feb17 Inline asn1_proto.h since the API is stable and public. 2008-10-23 18:03:20 +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
3f0406f609 Optimize x_fread to speed up the smbclient put command 2008-10-23 17:45:52 +02:00
Jelmer Vernooij
cf659fa4fe Import talloc_stack into util library. 2008-10-23 17:27:30 +02:00
Jelmer Vernooij
44b728958a Use common error definitions. 2008-10-23 15:35:21 +02:00
Jelmer Vernooij
94c522b1ab Import NTSTATUS defines from Samba 3. 2008-10-23 03:29:20 +02:00
Günther Deschner
9994cbffa7 s3-build: temporarily add asn1_proto file.
Jelmer, how can we get this autogenerated from samba3 in the non merged-build
case ?

Guenther
2008-10-22 21:58:00 +02:00
Günther Deschner
5d805425b9 lib-util: merge from s3 asn1.
Guenther
2008-10-22 21:37:36 +02:00
Günther Deschner
d81a9a9837 lib-util: fix c++ compile warning.
Guenther
2008-10-22 21:37:36 +02:00
Jelmer Vernooij
4ba0453c3c Fix AC_SEARCH_LIBS_EXT() usage. 2008-10-21 18:33:38 +02:00
Jelmer Vernooij
87ec1d2532 Make sure prototypes are always included, make some functions static and
remove some unused functions.
2008-10-20 18:59:51 +02:00
Jelmer Vernooij
01a902f599 Fix crypto test. 2008-10-20 18:59:45 +02:00
Jelmer Vernooij
0dfd5601a0 Move discard_const hack to memory.hso it can be used by Samba 3. 2008-10-20 17:15:17 +02:00
Jelmer Vernooij
93e52145a8 Provide two symbols to allow ndrdump compiled by Samba 3 to be used for
Samba 4.
2008-10-20 13:24:16 +02:00
Jelmer Vernooij
68bb6e56ba Rename BAD to BAD_DATA since the first is already defined on SunOS. 2008-10-20 10:45:42 +02:00
Jelmer Vernooij
620a27bdf1 Don't assume crypt.h is present even if crypt() is. 2008-10-20 10:38:03 +02:00
Jelmer Vernooij
974ab9d2f9 Use _EXT version of autoconf macro. 2008-10-19 15:47:36 +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
085e7b0b6c Fix segfault when using DEBUG() in the merged build. 2008-10-19 14:14:55 +02:00
Jelmer Vernooij
069437a2fa Just call talloc_free directly rather than through a helper function. 2008-10-19 13:52:56 +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
Jelmer Vernooij
c484b0465c Move SMB-specific attribute function to SMB client library. 2008-10-19 10:45:02 +02:00
Günther Deschner
7966b00b3a lib/util: fix strhex_to_data_blob to use data_blob_talloc.
Jelmer, I'm pretty sure you wanted to do this. Please check.

Guenther
2008-10-18 22:46:37 +02:00
Günther Deschner
98089dfccf crypto: fix remaining strhex_to_data_blob callers.
Jelmer, please check.

Guenther
2008-10-18 21:07:42 +02:00
Jelmer Vernooij
17b12ee183 Add extra parameter consistent with samba3. 2008-10-18 19:03:19 +02:00
Jelmer Vernooij
2243479b74 Merge branch 'master' of ssh://git.samba.org/data/git/samba 2008-10-18 18:30:10 +02:00
Jelmer Vernooij
6a89b59ca6 Add TALLOC_CTX pointer to strhex_to_data_blob for consistency with Samba
3.
2008-10-18 18:09:04 +02:00
Jelmer Vernooij
33032d591f Move ufc to libreplace. 2008-10-18 17:49:41 +02:00
Jelmer Vernooij
63de2d9823 Move substitute functions to a different file. 2008-10-18 15:56:45 +02:00
Jelmer Vernooij
23c95c9119 Add libutil README file. 2008-10-18 15:49:11 +02:00
Jelmer Vernooij
b3b6d8f3f9 Fix const, dupes. 2008-10-18 15:00:18 +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
9d9f5b44ed Use common detection function for zlib. 2008-10-18 14:14:44 +02:00
Jelmer Vernooij
fcce58cc61 Add extra argument free_on_fail to realloc_array() in Samba 4, as used by Samba 3. 2008-10-18 14:12:56 +02:00
Jelmer Vernooij
3189d14152 Use the new memory macro file from Samba 3. 2008-10-18 14:07:51 +02:00
Jelmer Vernooij
dc5dc3b469 Move some of the memory utility macros to a separate header (for now). 2008-10-18 13:59:21 +02:00
Jelmer Vernooij
0132423a09 Share libndr.h between Samba 3 and Samba 4. 2008-10-15 00:35:13 +02:00
Jelmer Vernooij
3bd73c926e Define inttypes macros if not provided by system. 2008-10-14 04:12:53 +02:00
Jelmer Vernooij
b96329f4f9 Define __STDC_FORMAT_MACROS, required for PRIu64 define (among others)
from inttypes.h.
2008-10-14 03:42:54 +02:00
Jelmer Vernooij
fd443f819e Use common fusage implementation. 2008-10-14 02:16:27 +02:00
Tim Prouty
abe443a65e Remove extraneous comment from 0a33d8bd31 2008-10-13 15:10:23 -07:00
Tim Prouty
0a33d8bd31 Check for f_frsize when using statvfs
Add a configure test for the availability of f_frsize in struct
statvfs (for broken platforms that define statvfs but still have
f_bsize/f_iosize). Ported from source3's fsusage:
commit 472519eb69
2008-10-13 14:24:08 -07:00
Jelmer Vernooij
65d5b1e7b4 Test maxsize parameter to file_load() as used in Samba 3. 2008-10-13 16:40:27 +02:00
Jelmer Vernooij
eaba778416 Add test for data_blob_string_const_null. 2008-10-13 16:29:19 +02:00
Jelmer Vernooij
aa982895e5 Add data_blob_string_const_null() function that includes the terminating
null byte and use it in Samba 3.

This matches the behaviour prior to my data_blob changes.
2008-10-13 05:20:26 +02:00
Günther Deschner
d5a11f9679 fix build warnings.
Guenther
2008-10-13 00:40:57 +02:00