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

167 Commits

Author SHA1 Message Date
Jelmer Vernooij
94069bd274 s4: Use same function signature for convert_* as s3. 2009-03-01 19:55:46 +01:00
Jelmer Vernooij
4903d20c21 Merge branch 'master' of git://git.samba.org/samba into convenience 2009-03-01 16:41:57 +01:00
Jelmer Vernooij
55903e6f91 Move next_token_talloc to util.c, as util_str.c is only compiled inside samba 4. 2009-03-01 16:19:38 +01:00
Jelmer Vernooij
d776ac03c3 Move next_token_talloc() to top-level. 2009-03-01 16:16:16 +01:00
Jelmer Vernooij
9f6e2d6485 Sync smb_iconv_t type, convert_string return type with Samba 3 equivalents. 2009-03-01 12:59:58 +01:00
Jelmer Vernooij
9ffb6d2d9e Add allow_badcharcnv argument to all conversion function, for
consistency with Samba 3.
2009-03-01 06:33:40 +01:00
Volker Lendecke
4d22554e98 Add tevent_ntstatus 2009-02-26 13:04:33 +01:00
Volker Lendecke
c50233695e Add tevent_req_is_unix_error 2009-02-24 20:40:46 +01:00
Steven Danneman
8d63c596a0 Refactored sys_fork() and sys_pid() into shared util library
This fixes a bug in 116ce19b, where we didn't clear the pid cache in
become_daemon() and thus the /var/run/smbd.pid didn't match the actual
pid of the parent process.

Currently S4 will clear the pid cache on fork but doesn't yet take
advantage of the pid cache by using sys_pid() instead of the direct
get_pid().
2009-02-23 21:17:12 -08:00
Tim Prouty
39b508e38e Fix shadowed declaration warning 2009-02-21 14:00:05 -08:00
Steven Danneman
116ce19b10 Moved become_daemon() and close_low_fds() to shared util lib 2009-02-20 16:30:12 -08:00
Volker Lendecke
0844cca1d5 Replace get_myname() with the talloc version from v3-3-test 2009-02-13 12:15:03 +01:00
Volker Lendecke
c2f7f1b40b Fix Coverity ID 707 (RESOURCE_LEAK) 2009-02-13 10:21:03 +01:00
Jelmer Vernooij
0afa0ab442 Revert "s3/s4: Move CONST_DISCARD into lib/util so it's available from s3 and s4"
lib/util already has discard_const_p.

This reverts commit 0cb430c22e.
2009-02-09 17:48:30 +01:00
Volker Lendecke
cfc27ece10 Attempt to fix "make test" on host "tridge" 2009-02-02 15:39:13 +01:00
Stefan Metzmacher
48a0721606 lib/util: s/new/pn in idtree.c
metze
2009-02-02 13:09:16 +01:00
Stefan Metzmacher
5e6e370c4e lib/util: s/class/dclass
metze
2009-02-02 13:09:16 +01:00
Simo Sorce
10c907bcdb Fix headers, only ldb.h is required 2009-02-01 13:06:13 -05:00
Stefan Metzmacher
24a1b556fc s4:lib/util: fix the build
metze
2009-01-30 18:42:08 +01:00
Stefan Metzmacher
94cb0835ca s4:build: kill DEFAULT_HEADERS variable
metze
2009-01-30 17:38:40 +01:00
Jeremy Allison
77bac5b78c Fix coverity CID#66. Resource leak in error path.
Jeremy.
2009-01-29 17:16:34 -08:00
Stefan Metzmacher
9967907190 util_str: setup the correct talloc name for strings
metze
(partly from samba4wins tree 447e7f9532131117e896712db9def321c96718eb)
2009-01-19 07:05:21 +01:00
Günther Deschner
87fec1450f lib: add strlen_m_term_null from s3.
Guenther
2009-01-16 00:28:45 +01:00
Stefan Metzmacher
49a6d757b4 s4:debug: make setup_logging() a bit more compatible with samba3
In samba3 the 2nd argument is bool interactive.
E.g ndrdump uses true there which used to map to DEBUG_FILE
in samba4, it maps to DEBUG_STDOUT now, which is better.

In the end end samba3 should also use the samba4 version of
setup_logging()

metze
2009-01-09 13:10:07 +01:00
Jelmer Vernooij
078879735b Print the failed value in the time tests. 2009-01-08 12:45:57 +01:00
Jelmer Vernooij
ba5d6e6d70 Avoid using a utility header for Python replacements included in Samba,
since this will not be shipped with talloc/tdb/tevent/etc.
2009-01-08 12:20:20 +01:00
Tim Prouty
61a23c5eea s3/s4 build: Fix Py_RETURN_NONE to work with python versions < 2.4 2009-01-07 15:03:16 -08:00
Tim Prouty
0cb430c22e s3/s4: Move CONST_DISCARD into lib/util so it's available from s3 and s4 2008-12-30 16:19:42 -08:00
Jelmer Vernooij
ef80d1b794 Fix use of "time offset" parameter, and add test to make sure I don't break it again :-) 2008-12-23 22:10:34 +01:00
Stefan Metzmacher
b97f17ddf1 lib/util: make it possible to use debug.h with using xfile.h
metze
2008-12-17 13:31:29 +01:00
Tim Prouty
1eb743ab8e s3: Change sockaddr util function names for consistency
Also eliminates name conflicts with OneFS system libraries
2008-12-03 10:40:20 -08:00
Tim Prouty
2b85288e82 s3 build: Fix incomplete types warnings 2008-11-20 13:11:59 -08:00
Tim Prouty
1115b7b342 s3/s4 build: Fix execinfo and sasl build error when the libs/headers are in non-standard locations.
These configure checks have the correct flags at configure time, so
let's pass them through so they are used at compile time.
2008-11-18 17:43:51 -08:00
Stefan Metzmacher
64b6d2d3e3 lib/util: hex_encode_talloc(): fix error path and set talloc name
metze
2008-11-16 16:24:33 +01:00
Jelmer Vernooij
29177203e5 Rename class to "cls" since the first is a keyword name in C++. Thanks,
Brad.
2008-11-02 04:50:32 +01:00
Jelmer Vernooij
57a60f0920 Move lp_*() calls a bit higher up the calls tack. 2008-11-01 22:13:47 +01:00
Jelmer Vernooij
fa7bb8ac53 Remove convert_string_talloc_descriptor, add iconv_talloc(). 2008-11-01 20:56:27 +01:00
Jelmer Vernooij
e5081d6dad Move ABS() to libutil. 2008-11-01 20:44:12 +01:00
Jelmer Vernooij
1b05be1039 ALlow util/debug.h to be included more than once. 2008-11-01 15:21:31 +01:00
Jelmer Vernooij
d880faae92 Fix includes in installed version of talloc_stack.h. 2008-11-01 15:13:00 +01:00
Jelmer Vernooij
31fa08dcbd Merge branch 'master' of /home/jelmer/samba3
Conflicts:
	lib/replace/README
	lib/replace/libreplace.m4
	lib/replace/replace.c
	source3/include/proto.h
	source3/lib/system.c
2008-11-01 04:02:47 +01:00
Jelmer Vernooij
dfc78b1dc2 Only provide valgrind_strlen prototype when it's being compiled in. 2008-11-01 03:27:41 +01:00
Jelmer Vernooij
9de80e7abc Samba3: Include util.h header file rather than having custom prototypes. 2008-11-01 03:14:43 +01:00
Jelmer Vernooij
ce67cf0456 Install additional libutil headers. 2008-11-01 01:29:12 +01:00
Andrew Tridgell
55d55d9d9b finished adding UTF16_MUNGED charset
Changed the approach for the charset to go via utf16, which makes a
bit more sense to read. 

Added a testsuiite for UTF16_MUNGED as part of LOCAL-ICONV
2008-10-31 15:41:34 +11:00
Andrew Tridgell
391264a100 added a new charset for string2key
This charset follows the rules for converting random buffers to utf8
strings, matching the way windows does it. This should allow us to be
compatible for the generation of AES keys
2008-10-31 13:51:37 +11:00
Jelmer Vernooij
0218669d62 Remove include/local.h and move defines to more appropriate places. 2008-10-24 17:53:38 +02:00
Jelmer Vernooij
23302413b3 Remove unused include param/param.h. 2008-10-24 16:37:56 +02:00
Jelmer Vernooij
f7692d16e3 Remove more global_loadparm instances, fix syntax errors. 2008-10-24 16:12:14 +02:00
Jelmer Vernooij
c3415b3e57 Add version of next_codepoint without iconv_convenience. 2008-10-24 16:00:43 +02:00
Jelmer Vernooij
61013deff8 Remove dependency of charset code on loadparm. 2008-10-24 14:45:31 +02:00
Jelmer Vernooij
37d885c51a Remove iconv_convenience argument from convert_string{,talloc}() but
make them wrappers around convert_string{,talloc}_convenience().
2008-10-24 14:26:46 +02:00
Jelmer Vernooij
5d146d0178 Avoid retrieving iconv convenience during loops. 2008-10-24 04:39:09 +02:00
Jelmer Vernooij
922a29992e Remove iconv_convenience parameter from simple string push/pull
functions.
2008-10-24 03:40:09 +02:00
Jelmer Vernooij
7ec58471df Split up codepoints code, use consistent _m suffix. 2008-10-24 02:51:03 +02:00
Jelmer Vernooij
5e4767b532 Rename string_replace_w to string_replace_m, which is more correct. 2008-10-24 01:19:33 +02:00
Jelmer Vernooij
420781bf46 Remove unnecessary include, improve function name. 2008-10-24 01:18:56 +02:00
Jelmer Vernooij
09a63accb8 Move charset library to top level. 2008-10-24 00:06:35 +02:00
Jelmer Vernooij
22f566c39b Move set_sockaddr_port to libutil. 2008-10-23 21:08:13 +02:00
Jelmer Vernooij
fe36fe8c3e Use common net utility code (address and sockaddr manipulation). 2008-10-23 20:41:15 +02:00
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
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
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
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
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
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
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
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
Jelmer Vernooij
3994c42f19 Fix number of arguments for file_load() functions. 2008-10-12 19:46:38 +02:00
Jelmer Vernooij
3b0a1b0363 Make util_tdb.h static since it is now used by Samba3. 2008-10-12 17:50:41 +02:00