[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via 6e48267... s3: Open winbindd_cache.tdb with read/write access.
from 09f270e... s3: Fix bug 7202
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 6e48267c28b05c3837a3e5ffc1f5b58316cc286f
Author: Bo Yang boy...@samba.org
Date: Sun Mar 21 16:00:26 2010 +0800
s3: Open winbindd_cache.tdb with read/write access.
Open winbindd_cache.tdb with read/write access when validate the cache,
otherwise, validation fails to get lock in tdb_check. It results in
validation failure even the cache is good.
Signed-off-by: Bo Yang boy...@samba.org
---
Summary of changes:
source3/lib/tdb_validate.c |2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/lib/tdb_validate.c b/source3/lib/tdb_validate.c
index a1fb185..b4d0365 100644
--- a/source3/lib/tdb_validate.c
+++ b/source3/lib/tdb_validate.c
@@ -192,7 +192,7 @@ int tdb_validate_open(const char *tdb_path,
tdb_validate_data_func validate_fn)
DEBUG(5, (tdb_validate_open called for tdb '%s'\n, tdb_path));
- tdb = tdb_open_log(tdb_path, 0, TDB_DEFAULT, O_RDONLY, 0);
+ tdb = tdb_open_log(tdb_path, 0, TDB_DEFAULT, O_RDWR, 0);
if (!tdb) {
DEBUG(1, (Error opening tdb %s\n, tdb_path));
return ret;
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via aaafadb... s3: Fix unnecessary traversing winbindd_cache.tdb in
SIGHUP handler.
from 25a0750... s4-python: only install external python libs that are
missing
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit aaafadb7d5a835f88fce3fbea8127d9c5ddb7181
Author: Bo Yang boy...@samba.org
Date: Sat Mar 6 20:58:23 2010 +0800
s3: Fix unnecessary traversing winbindd_cache.tdb in SIGHUP handler.
Signed-off-by: Bo Yang boy...@samba.org
---
Summary of changes:
source3/winbindd/winbindd_cache.c |6 ++
1 files changed, 6 insertions(+), 0 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/winbindd/winbindd_cache.c
b/source3/winbindd/winbindd_cache.c
index 0e17253..db2f3b6 100644
--- a/source3/winbindd/winbindd_cache.c
+++ b/source3/winbindd/winbindd_cache.c
@@ -3042,6 +3042,12 @@ bool wcache_invalidate_cache_noinit(void)
if (cache) {
if (cache-tdb) {
tdb_traverse(cache-tdb, traverse_fn, NULL);
+ /*
+* Flushing cache has nothing to with domains.
+* return here if we successfully flushed once.
+* To avoid unnecessary traversing the cache.
+*/
+ return true;
} else {
return false;
}
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via 6384f45... s3: Rerun genmsg after adding more strings.
via ef0b4e4... s3: Add i18n/l10n strings in pam_winbind.c coming from
winbindd.
from fd00867... s4:samdb.c - Make it signed-safe
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 6384f45f5253203ad4356dc94d2f520f310625a5
Author: Bo Yang boy...@samba.org
Date: Sat Mar 6 01:59:55 2010 +0800
s3: Rerun genmsg after adding more strings.
Signed-off-by: Bo Yang boy...@samba.org
commit ef0b4e4687d9ea02554fe22f02cc615527e917ee
Author: Bo Yang boy...@samba.org
Date: Sat Mar 6 01:53:13 2010 +0800
s3: Add i18n/l10n strings in pam_winbind.c coming from winbindd.
Signed-off-by: Bo Yang boy...@samba.org
---
Summary of changes:
nsswitch/pam_winbind.c |2 +-
source3/libsmb/nterr.c | 186 +++---
source3/locale/pam_winbind/ar.po| 485 ++---
source3/locale/pam_winbind/cs.po| 485 ++---
source3/locale/pam_winbind/da.po| 476 +
source3/locale/pam_winbind/de.po| 464 +---
source3/locale/pam_winbind/es.po| 485 ++---
source3/locale/pam_winbind/fi.po| 476 +
source3/locale/pam_winbind/fr.po| 485 ++---
source3/locale/pam_winbind/genmsg |2 +-
source3/locale/pam_winbind/hu.po| 505 +++
source3/locale/pam_winbind/it.po| 485 ++---
source3/locale/pam_winbind/ja.po| 485 ++---
source3/locale/pam_winbind/ko.po| 485 ++---
source3/locale/pam_winbind/nb.po| 476 +
source3/locale/pam_winbind/nl.po| 485 ++---
source3/locale/pam_winbind/pl.po| 485 ++---
source3/locale/pam_winbind/pt_BR.po | 485 ++---
source3/locale/pam_winbind/ru.po| 485 ++---
source3/locale/pam_winbind/sv.po| 485 ++---
source3/locale/pam_winbind/zh_CN.po | 485 ++---
source3/locale/pam_winbind/zh_TW.po | 485 ++---
22 files changed, 8486 insertions(+), 891 deletions(-)
Changeset truncated at 500 lines:
diff --git a/nsswitch/pam_winbind.c b/nsswitch/pam_winbind.c
index 2689390..f13e365 100644
--- a/nsswitch/pam_winbind.c
+++ b/nsswitch/pam_winbind.c
@@ -1456,7 +1456,7 @@ static bool _pam_check_remark_auth_err(struct pwb_context
*ctx,
}
if (e-display_string) {
- _make_remark(ctx, PAM_ERROR_MSG, e-display_string);
+ _make_remark(ctx, PAM_ERROR_MSG, _(e-display_string));
*pam_error = e-pam_error;
return true;
}
diff --git a/source3/libsmb/nterr.c b/source3/libsmb/nterr.c
index 197d5bd..328ba3b 100644
--- a/source3/libsmb/nterr.c
+++ b/source3/libsmb/nterr.c
@@ -21,6 +21,10 @@
#include includes.h
+#if !defined(N_)
+#define N_(string) string
+#endif
+
typedef struct
{
const char *nt_errstr;
@@ -551,98 +555,98 @@ static const nt_err_code_struct nt_errs[] =
nt_err_code_struct nt_err_desc[] =
{
- { Success,NT_STATUS_OK },
- { Undetermined error, NT_STATUS_UNSUCCESSFUL },
- { Access denied, NT_STATUS_ACCESS_DENIED },
- { Account locked out, NT_STATUS_ACCOUNT_LOCKED_OUT },
- { Must change password, NT_STATUS_PASSWORD_MUST_CHANGE
},
- { Password is too short, NT_STATUS_PWD_TOO_SHORT },
- { Password is too recent, NT_STATUS_PWD_TOO_RECENT },
- { Password history conflict, NT_STATUS_PWD_HISTORY_CONFLICT
},
- { No logon servers, NT_STATUS_NO_LOGON_SERVERS },
- { Improperly formed account name, NT_STATUS_INVALID_ACCOUNT_NAME
},
- { User exists,NT_STATUS_USER_EXISTS },
- { No such user, NT_STATUS_NO_SUCH_USER },
- { Group exists, NT_STATUS_GROUP_EXISTS },
- { No such group, NT_STATUS_NO_SUCH_GROUP },
- { Member not in group,NT_STATUS_MEMBER_NOT_IN_GROUP },
- { Wrong Password, NT_STATUS_WRONG_PASSWORD },
- { Ill formed password,NT_STATUS_ILL_FORMED_PASSWORD },
- { Password restriction, NT_STATUS_PASSWORD_RESTRICTION
},
- { Logon failure
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via 9fed901... s3: Don't invalidate cache for uninitialized domains.
via 8c8bb51... s3: signals are processed twice in child.
from 2aff1d6... s3: quiet the unresolved symbol warnings of the Compaq
compiler when linking our vfs modules
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 9fed9011ffcd76c5a5dbf16f7d5e657b94f9fa50
Author: Bo Yang boy...@samba.org
Date: Tue Feb 9 16:35:40 2010 +0800
s3: Don't invalidate cache for uninitialized domains.
Signed-off-by: Bo Yang boy...@samba.org
commit 8c8bb51de1ac2baa46ac0736fae12c034288e5d4
Author: Bo Yang boy...@samba.org
Date: Tue Feb 9 17:02:20 2010 +0800
s3: signals are processed twice in child.
Signed-off-by: Bo Yang boy...@samba.org
---
Summary of changes:
lib/tevent/tevent.c |7 +++
lib/tevent/tevent_internal.h |1 +
lib/tevent/tevent_signal.c| 33 -
source3/winbindd/winbindd.c | 25 -
source3/winbindd/winbindd_cache.c | 27 +++
source3/winbindd/winbindd_proto.h |1 +
6 files changed, 88 insertions(+), 6 deletions(-)
Changeset truncated at 500 lines:
diff --git a/lib/tevent/tevent.c b/lib/tevent/tevent.c
index 56d0da3..a0ee208 100644
--- a/lib/tevent/tevent.c
+++ b/lib/tevent/tevent.c
@@ -176,6 +176,13 @@ int tevent_common_context_destructor(struct tevent_context
*ev)
sn = se-next;
se-event_ctx = NULL;
DLIST_REMOVE(ev-signal_events, se);
+ /*
+* This is important, Otherwise signals
+* are handled twice in child. eg, SIGHUP.
+* one added in parent, and another one in
+* the child. -- BoYang
+*/
+ tevent_cleanup_pending_signal_handlers(se);
}
return 0;
diff --git a/lib/tevent/tevent_internal.h b/lib/tevent/tevent_internal.h
index e10f52e..7f5fd64 100644
--- a/lib/tevent/tevent_internal.h
+++ b/lib/tevent/tevent_internal.h
@@ -299,6 +299,7 @@ struct tevent_signal *tevent_common_add_signal(struct
tevent_context *ev,
const char *handler_name,
const char *location);
int tevent_common_check_signal(struct tevent_context *ev);
+void tevent_cleanup_pending_signal_handlers(struct tevent_signal *se);
bool tevent_standard_init(void);
bool tevent_select_init(void);
diff --git a/lib/tevent/tevent_signal.c b/lib/tevent/tevent_signal.c
index 0f3d83e..45f65cf 100644
--- a/lib/tevent/tevent_signal.c
+++ b/lib/tevent/tevent_signal.c
@@ -133,7 +133,9 @@ static void tevent_common_signal_handler_info(int signum,
siginfo_t *info,
static int tevent_common_signal_list_destructor(struct
tevent_common_signal_list *sl)
{
- DLIST_REMOVE(sig_state-sig_handlers[sl-se-signum], sl);
+ if (sig_state-sig_handlers[sl-se-signum]) {
+ DLIST_REMOVE(sig_state-sig_handlers[sl-se-signum], sl);
+ }
return 0;
}
@@ -154,12 +156,16 @@ static int tevent_signal_destructor(struct tevent_signal
*se)
if (sig_state-sig_handlers[se-signum] == NULL) {
/* restore old handler, if any */
- sigaction(se-signum, sig_state-oldact[se-signum], NULL);
- sig_state-oldact[se-signum] = NULL;
+ if (sig_state-oldact[se-signum]) {
+ sigaction(se-signum, sig_state-oldact[se-signum],
NULL);
+ sig_state-oldact[se-signum] = NULL;
+ }
#ifdef SA_SIGINFO
if (se-sa_flags SA_SIGINFO) {
- talloc_free(sig_state-sig_info[se-signum]);
- sig_state-sig_info[se-signum] = NULL;
+ if (sig_state-sig_info[se-signum]) {
+ talloc_free(sig_state-sig_info[se-signum]);
+ sig_state-sig_info[se-signum] = NULL;
+ }
}
#endif
}
@@ -398,3 +404,20 @@ int tevent_common_check_signal(struct tevent_context *ev)
return 1;
}
+
+void tevent_cleanup_pending_signal_handlers(struct tevent_signal *se)
+{
+ struct tevent_common_signal_list *sl;
+ sl = talloc_get_type(se-additional_data,
+struct tevent_common_signal_list);
+
+ tevent_common_signal_list_destructor(sl);
+
+ if (sig_state-sig_handlers[se-signum] == NULL) {
+ if (sig_state-oldact[se-signum]) {
+ sigaction(se-signum, sig_state-oldact[se-signum],
NULL);
+ sig_state-oldact[se-signum] = NULL;
+ }
+ }
+ return;
+}
diff --git a/source3/winbindd/winbindd.c
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via 913a9f4... s3: Fix malformed require_membership_of_sid.
from 5dbf175... s3-events: make the old timed events compatible with
tevent
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 913a9f4e420c7a4177e6a7874e8ec2703f447918
Author: Bo Yang boy...@samba.org
Date: Sun Feb 7 14:45:42 2010 +0800
s3: Fix malformed require_membership_of_sid.
Signed-off-by: Bo Yang boy...@samba.org
---
Summary of changes:
nsswitch/pam_winbind.c | 12
1 files changed, 12 insertions(+), 0 deletions(-)
Changeset truncated at 500 lines:
diff --git a/nsswitch/pam_winbind.c b/nsswitch/pam_winbind.c
index 51346a8..52a8daa 100644
--- a/nsswitch/pam_winbind.c
+++ b/nsswitch/pam_winbind.c
@@ -1137,6 +1137,7 @@ static bool winbind_name_list_to_sid_string_list(struct
pwb_context *ctx,
char *current_name = NULL;
const char *search_location;
const char *comma;
+ int len;
if (sid_list_buffer_size 0) {
sid_list_buffer[0] = 0;
@@ -1192,6 +1193,17 @@ static bool winbind_name_list_to_sid_string_list(struct
pwb_context *ctx,
_make_remark_format(ctx, PAM_TEXT_INFO, _(Cannot convert group
%s
to sid, please contact your administrator to
see
if group %s is valid.), search_location,
search_location);
+ /*
+* The lookup of the last name failed..
+* It results in require_member_of_sid ends with ','
+* It is malformated parameter here, overwrite the last ','.
+*/
+ len = strlen(sid_list_buffer);
+ if (len) {
+ if (sid_list_buffer[len - 1] == ',') {
+ sid_list_buffer[len - 1] = '\0';
+ }
+ }
}
result = true;
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via d06fb8e0.. s3: List trusted domains from wcache when domain is
offline.
via 133638c... s3: Make winbindd_cache.c aware of domain offline to
avoid unnecessary backend query.
via 36493bf... s3: Fix infinite loop in NCACN_IP_TCP asa there is no
timeout. Assume lsa_pipe_tcp is ok but network is down, then send request is
ok, but select() on writeable fds loops forever since there is no response.
from da41f23... s3 net: Fix up a share type translation and translate
some more strings
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit d06fb8e02706559e91c6d185427409bb093bb896
Author: Bo Yang boy...@samba.org
Date: Wed Jan 6 19:13:59 2010 +0800
s3: List trusted domains from wcache when domain is offline.
Signed-off-by: Bo Yang boy...@samba.org
commit 133638c8aea7280d01b5a23150428977e9ff0e11
Author: Bo Yang boy...@samba.org
Date: Wed Jan 6 15:05:20 2010 +0800
s3: Make winbindd_cache.c aware of domain offline to avoid unnecessary
backend query.
Signed-off-by: Bo Yang boy...@samba.org
commit 36493bf2f6634b84c57107bcb86bcbf3e82e80fc
Author: Bo Yang boy...@samba.org
Date: Wed Jan 6 12:13:35 2010 +0800
s3: Fix infinite loop in NCACN_IP_TCP asa there is no timeout. Assume
lsa_pipe_tcp is ok but network is down, then send request is ok, but select()
on writeable fds loops forever since there is no response.
Signed-off-by: Bo Yang boy...@samba.org
---
Summary of changes:
source3/include/proto.h |5 +
source3/rpc_client/cli_pipe.c | 26 ++-
source3/rpc_client/ndr.c| 15 ++
source3/rpc_client/rpc_transport_np.c | 12 +
source3/rpc_client/rpc_transport_smbd.c | 10 +
source3/rpc_client/rpc_transport_sock.c | 53 +
source3/winbindd/winbindd_cache.c | 380 ++-
source3/winbindd/winbindd_cm.c |3 +-
source3/winbindd/winbindd_rpc.c | 14 +-
9 files changed, 501 insertions(+), 17 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/include/proto.h b/source3/include/proto.h
index b3921c4..d956ede 100644
--- a/source3/include/proto.h
+++ b/source3/include/proto.h
@@ -5396,6 +5396,7 @@ NTSTATUS rpc_transport_np_init(TALLOC_CTX *mem_ctx,
struct cli_state *cli,
const struct ndr_syntax_id *abstract_syntax,
struct rpc_cli_transport **presult);
struct cli_state *rpc_pipe_np_smb_conn(struct rpc_pipe_client *p);
+void rpccli_close_np_fd(struct rpc_pipe_client *p);
/* The following definitions come from rpc_client/rpc_transport_smbd.c */
@@ -5426,11 +5427,15 @@ NTSTATUS rpc_transport_smbd_init(TALLOC_CTX *mem_ctx,
struct rpc_cli_smbd_conn *conn,
const struct ndr_syntax_id *abstract_syntax,
struct rpc_cli_transport **presult);
+struct cli_state *rpc_pipe_smbd_smb_conn(struct rpc_pipe_client *p);
/* The following definitions come from rpc_client/rpc_transport_sock.c */
NTSTATUS rpc_transport_sock_init(TALLOC_CTX *mem_ctx, int fd,
struct rpc_cli_transport **presult);
+int rpccli_set_sock_timeout(struct rpc_pipe_client *rpccli, int timeout);
+void rpccli_close_sock_fd(struct rpc_pipe_client *rpccli);
+bool rpc_pipe_tcp_connection_ok(struct rpc_pipe_client *rpccli);
/* The following definitions come from rpc_client/cli_samr.c */
diff --git a/source3/rpc_client/cli_pipe.c b/source3/rpc_client/cli_pipe.c
index 9653166..48e2f9e 100644
--- a/source3/rpc_client/cli_pipe.c
+++ b/source3/rpc_client/cli_pipe.c
@@ -3035,12 +3035,30 @@ NTSTATUS rpc_pipe_bind(struct rpc_pipe_client *cli,
unsigned int rpccli_set_timeout(struct rpc_pipe_client *rpc_cli,
unsigned int timeout)
{
- struct cli_state *cli = rpc_pipe_np_smb_conn(rpc_cli);
+ struct cli_state *cli;
- if (cli == NULL) {
- return 0;
+ if (rpc_cli-transport-transport == NCACN_NP) {
+ cli = rpc_pipe_np_smb_conn(rpc_cli);
+ if (cli == NULL) {
+ return 0;
+ }
+ return cli_set_timeout(cli, timeout);
+ }
+
+ if (rpc_cli-transport-transport == NCACN_IP_TCP ||
+ rpc_cli-transport-transport == NCALRPC) {
+ return rpccli_set_sock_timeout(rpc_cli, timeout);
}
- return cli_set_timeout(cli, timeout);
+
+ if (rpc_cli-transport-transport == NCACN_INTERNAL) {
+ cli = rpc_pipe_smbd_smb_conn(rpc_cli);
+ if (!cli) {
+ return 0;
+ }
+ return cli_set_timeout(cli, timeout);
+ }
+
+ return 0;
}
bool
[SCM] Samba Shared Repository - branch v3-5-test updated
The branch, v3-5-test has been updated
via 65003db... s3: List trusted domains from wcache when domain is
offline.
via 063a2ce... s3: Make winbindd_cache.c aware of domain offline to
avoid unnecessary backend query.
via b58b359... s3: Fix infinite loop in NCACN_IP_TCP asa there is no
timeout. Assume lsa_pipe_tcp is ok but network is down, then send request is
ok, but select() on writeable fds loops forever since there is no response.
from 0272f44... s3 net: Fix up a share type translation and translate
some more strings (cherry picked from commit
da41f23bdad1ea3a1a49110217cfde3efcde5075)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-5-test
- Log -
commit 65003db3685098dd3b8370c5a6fc673c9eba5d7a
Author: Bo Yang boy...@samba.org
Date: Wed Jan 6 19:13:59 2010 +0800
s3: List trusted domains from wcache when domain is offline.
Signed-off-by: Bo Yang boy...@samba.org
(cherry picked from commit d06fb8e02706559e91c6d185427409bb093bb896)
commit 063a2ceb9192a5b1820a7e115decc49357f2b3b6
Author: Bo Yang boy...@samba.org
Date: Wed Jan 6 15:05:20 2010 +0800
s3: Make winbindd_cache.c aware of domain offline to avoid unnecessary
backend query.
Signed-off-by: Bo Yang boy...@samba.org
(cherry picked from commit 133638c8aea7280d01b5a23150428977e9ff0e11)
commit b58b359881c91ec382cfa1d6ba3007b8354b29cb
Author: Bo Yang boy...@samba.org
Date: Wed Jan 6 12:13:35 2010 +0800
s3: Fix infinite loop in NCACN_IP_TCP asa there is no timeout. Assume
lsa_pipe_tcp is ok but network is down, then send request is ok, but select()
on writeable fds loops forever since there is no response.
Signed-off-by: Bo Yang boy...@samba.org
(cherry picked from commit 36493bf2f6634b84c57107bcb86bcbf3e82e80fc)
---
Summary of changes:
source3/include/proto.h |5 +
source3/rpc_client/cli_pipe.c | 26 ++-
source3/rpc_client/ndr.c| 15 ++
source3/rpc_client/rpc_transport_np.c | 12 +
source3/rpc_client/rpc_transport_smbd.c | 10 +
source3/rpc_client/rpc_transport_sock.c | 53 +
source3/winbindd/winbindd_cache.c | 380 ++-
source3/winbindd/winbindd_cm.c |3 +-
source3/winbindd/winbindd_rpc.c | 14 +-
9 files changed, 501 insertions(+), 17 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/include/proto.h b/source3/include/proto.h
index d2ebd92..b3512d9 100644
--- a/source3/include/proto.h
+++ b/source3/include/proto.h
@@ -5377,6 +5377,7 @@ NTSTATUS rpc_transport_np_init(TALLOC_CTX *mem_ctx,
struct cli_state *cli,
const struct ndr_syntax_id *abstract_syntax,
struct rpc_cli_transport **presult);
struct cli_state *rpc_pipe_np_smb_conn(struct rpc_pipe_client *p);
+void rpccli_close_np_fd(struct rpc_pipe_client *p);
/* The following definitions come from rpc_client/rpc_transport_smbd.c */
@@ -5407,11 +5408,15 @@ NTSTATUS rpc_transport_smbd_init(TALLOC_CTX *mem_ctx,
struct rpc_cli_smbd_conn *conn,
const struct ndr_syntax_id *abstract_syntax,
struct rpc_cli_transport **presult);
+struct cli_state *rpc_pipe_smbd_smb_conn(struct rpc_pipe_client *p);
/* The following definitions come from rpc_client/rpc_transport_sock.c */
NTSTATUS rpc_transport_sock_init(TALLOC_CTX *mem_ctx, int fd,
struct rpc_cli_transport **presult);
+int rpccli_set_sock_timeout(struct rpc_pipe_client *rpccli, int timeout);
+void rpccli_close_sock_fd(struct rpc_pipe_client *rpccli);
+bool rpc_pipe_tcp_connection_ok(struct rpc_pipe_client *rpccli);
/* The following definitions come from rpc_client/cli_samr.c */
diff --git a/source3/rpc_client/cli_pipe.c b/source3/rpc_client/cli_pipe.c
index 23f002c..2f84828 100644
--- a/source3/rpc_client/cli_pipe.c
+++ b/source3/rpc_client/cli_pipe.c
@@ -3034,12 +3034,30 @@ NTSTATUS rpc_pipe_bind(struct rpc_pipe_client *cli,
unsigned int rpccli_set_timeout(struct rpc_pipe_client *rpc_cli,
unsigned int timeout)
{
- struct cli_state *cli = rpc_pipe_np_smb_conn(rpc_cli);
+ struct cli_state *cli;
- if (cli == NULL) {
- return 0;
+ if (rpc_cli-transport-transport == NCACN_NP) {
+ cli = rpc_pipe_np_smb_conn(rpc_cli);
+ if (cli == NULL) {
+ return 0;
+ }
+ return cli_set_timeout(cli, timeout);
+ }
+
+ if (rpc_cli-transport-transport == NCACN_IP_TCP ||
+ rpc_cli-transport-transport == NCALRPC) {
+ return rpccli_set_sock_timeout(rpc_cli, timeout);
}
- return cli_set_timeout(cli, timeout
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via b386c33... s3: Fix build on non-linux platform.
from bfbccbb... WHATSNEW4: Samba 3.0 is not up-to-date.
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit b386c3311d8c05ccbd075ab86be2ddace335b73b
Author: Bo Yang boy...@samba.org
Date: Thu Dec 10 17:20:03 2009 +0800
s3: Fix build on non-linux platform.
Signed-off-by: Bo Yang boy...@samba.org
---
Summary of changes:
nsswitch/pam_winbind.c |8
1 files changed, 8 insertions(+), 0 deletions(-)
Changeset truncated at 500 lines:
diff --git a/nsswitch/pam_winbind.c b/nsswitch/pam_winbind.c
index 2563f38..2e6520c 100644
--- a/nsswitch/pam_winbind.c
+++ b/nsswitch/pam_winbind.c
@@ -807,6 +807,8 @@ static int wbc_auth_error_to_pam_error(struct pwb_context
*ctx,
return pam_winbind_request_log(ctx, ret, username, fn);
}
+/* PAM_RADIO_TYPE is linux-only. */
+#ifdef LINUX
static bool _pam_winbind_change_pwd(struct pwb_context *ctx)
{
struct pam_message msg, *pmsg;
@@ -837,6 +839,12 @@ static bool _pam_winbind_change_pwd(struct pwb_context
*ctx)
_pam_drop_reply(resp, 1);
return retval;
}
+#else
+static bool _pam_winbind_change_pwd(struct pwb_context *ctx)
+{
+ return false;
+}
+#endif
/**
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch v3-5-test updated
The branch, v3-5-test has been updated
via 9a522cd... s3: Fix build on non-linux platform.
from 7097f61... s3: Give the user a chance to change password when
password will expire soon.
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-5-test
- Log -
commit 9a522cd96d66f6a6cf5f483fb8928982bbe95ea4
Author: Bo Yang boy...@samba.org
Date: Thu Dec 10 17:20:03 2009 +0800
s3: Fix build on non-linux platform.
Signed-off-by: Bo Yang boy...@samba.org
(cherry picked from commit b386c3311d8c05ccbd075ab86be2ddace335b73b)
---
Summary of changes:
nsswitch/pam_winbind.c |8
1 files changed, 8 insertions(+), 0 deletions(-)
Changeset truncated at 500 lines:
diff --git a/nsswitch/pam_winbind.c b/nsswitch/pam_winbind.c
index f82a7be..debffed 100644
--- a/nsswitch/pam_winbind.c
+++ b/nsswitch/pam_winbind.c
@@ -807,6 +807,8 @@ static int wbc_auth_error_to_pam_error(struct pwb_context
*ctx,
return pam_winbind_request_log(ctx, ret, username, fn);
}
+/* PAM_RADIO_TYPE is linux-only. */
+#ifdef LINUX
static bool _pam_winbind_change_pwd(struct pwb_context *ctx)
{
struct pam_message msg, *pmsg;
@@ -837,6 +839,12 @@ static bool _pam_winbind_change_pwd(struct pwb_context
*ctx)
_pam_drop_reply(resp, 1);
return retval;
}
+#else
+static bool _pam_winbind_change_pwd(struct pwb_context *ctx)
+{
+ return false;
+}
+#endif
/**
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via c7e3a2d... s3: check for PAM_RADIO_TYPE.
from b386c33... s3: Fix build on non-linux platform.
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit c7e3a2dc319cc6504356be7fa7970917404a69b5
Author: Bo Yang boy...@samba.org
Date: Thu Dec 10 19:29:24 2009 +0800
s3: check for PAM_RADIO_TYPE.
Signed-off-by: Bo Yang boy...@samba.org
---
Summary of changes:
nsswitch/pam_winbind.c |4 +---
source3/configure.in | 33 +
2 files changed, 34 insertions(+), 3 deletions(-)
Changeset truncated at 500 lines:
diff --git a/nsswitch/pam_winbind.c b/nsswitch/pam_winbind.c
index 2e6520c..51346a8 100644
--- a/nsswitch/pam_winbind.c
+++ b/nsswitch/pam_winbind.c
@@ -807,8 +807,7 @@ static int wbc_auth_error_to_pam_error(struct pwb_context
*ctx,
return pam_winbind_request_log(ctx, ret, username, fn);
}
-/* PAM_RADIO_TYPE is linux-only. */
-#ifdef LINUX
+#if defined(HAVE_PAM_RADIO_TYPE)
static bool _pam_winbind_change_pwd(struct pwb_context *ctx)
{
struct pam_message msg, *pmsg;
@@ -846,7 +845,6 @@ static bool _pam_winbind_change_pwd(struct pwb_context *ctx)
}
#endif
-
/**
* send a password expiry message if required
*
diff --git a/source3/configure.in b/source3/configure.in
index fc9e09b..0bd1006 100644
--- a/source3/configure.in
+++ b/source3/configure.in
@@ -4501,6 +4501,39 @@ if test x${try_pam} != xno;then
fi # try_pam != no
#
+# check for PAM_RADIO_TYPE
+AC_TRY_COMPILE([
+#if (!defined(LINUX))
+
+#define PAM_EXTERN extern
+#if defined(HAVE_SECURITY_PAM_APPL_H)
+#include security/pam_appl.h
+#elif defined(HAVE_PAM_PAM_APPL_H)
+#include pam/pam_appl.h
+#endif
+
+#endif
+
+#if defined(HAVE_SECURITY_PAM_MODULES_H)
+#include security/pam_modules.h
+#elif defined(HAVE_PAM_PAM_MODULES_H)
+#include pam/pam_modules.h
+#endif
+
+#if defined(HAVE_SECURITY__PAM_MACROS_H)
+#include security/_pam_macros.h
+#elif defined(HAVE_PAM__PAM_MACROS_H)
+#include pam/_pam_macros.h
+#endif
+
+#ifdef HAVE_SECURITY_PAM_EXT_H
+#include security/pam_ext.h
+#endif
+],
+[int i; i = PAM_RADIO_TYPE; ],
+AC_DEFINE(HAVE_PAM_RADIO_TYPE, 1, [Define to 1 if PAM_RADIO_TYPE is
available]),[])
+
+#
# check for pam_smbpass support
PAM_MODULES=
INSTALL_PAM_MODULES=
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch v3-5-test updated
The branch, v3-5-test has been updated
via fa57272... s3: check for PAM_RADIO_TYPE.
from 9a522cd... s3: Fix build on non-linux platform.
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-5-test
- Log -
commit fa572721577732c1b5d1cd32de4479a34c895919
Author: Bo Yang boy...@samba.org
Date: Thu Dec 10 19:29:24 2009 +0800
s3: check for PAM_RADIO_TYPE.
Signed-off-by: Bo Yang boy...@samba.org
(cherry picked from commit c7e3a2dc319cc6504356be7fa7970917404a69b5)
---
Summary of changes:
nsswitch/pam_winbind.c |4 +---
source3/configure.in | 33 +
2 files changed, 34 insertions(+), 3 deletions(-)
Changeset truncated at 500 lines:
diff --git a/nsswitch/pam_winbind.c b/nsswitch/pam_winbind.c
index debffed..3e13517 100644
--- a/nsswitch/pam_winbind.c
+++ b/nsswitch/pam_winbind.c
@@ -807,8 +807,7 @@ static int wbc_auth_error_to_pam_error(struct pwb_context
*ctx,
return pam_winbind_request_log(ctx, ret, username, fn);
}
-/* PAM_RADIO_TYPE is linux-only. */
-#ifdef LINUX
+#if defined(HAVE_PAM_RADIO_TYPE)
static bool _pam_winbind_change_pwd(struct pwb_context *ctx)
{
struct pam_message msg, *pmsg;
@@ -846,7 +845,6 @@ static bool _pam_winbind_change_pwd(struct pwb_context *ctx)
}
#endif
-
/**
* send a password expiry message if required
*
diff --git a/source3/configure.in b/source3/configure.in
index 20293ea..2da1f9e 100644
--- a/source3/configure.in
+++ b/source3/configure.in
@@ -4441,6 +4441,39 @@ if test x${try_pam} != xno;then
fi # try_pam != no
#
+# check for PAM_RADIO_TYPE
+AC_TRY_COMPILE([
+#if (!defined(LINUX))
+
+#define PAM_EXTERN extern
+#if defined(HAVE_SECURITY_PAM_APPL_H)
+#include security/pam_appl.h
+#elif defined(HAVE_PAM_PAM_APPL_H)
+#include pam/pam_appl.h
+#endif
+
+#endif
+
+#if defined(HAVE_SECURITY_PAM_MODULES_H)
+#include security/pam_modules.h
+#elif defined(HAVE_PAM_PAM_MODULES_H)
+#include pam/pam_modules.h
+#endif
+
+#if defined(HAVE_SECURITY__PAM_MACROS_H)
+#include security/_pam_macros.h
+#elif defined(HAVE_PAM__PAM_MACROS_H)
+#include pam/_pam_macros.h
+#endif
+
+#ifdef HAVE_SECURITY_PAM_EXT_H
+#include security/pam_ext.h
+#endif
+],
+[int i; i = PAM_RADIO_TYPE; ],
+AC_DEFINE(HAVE_PAM_RADIO_TYPE, 1, [Define to 1 if PAM_RADIO_TYPE is
available]),[])
+
+#
# check for pam_smbpass support
PAM_MODULES=
INSTALL_PAM_MODULES=
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via f772329... s3: Give the user a chance to change password when
password will expire soon.
from fd58556... s3: keep subsecond times on cross-filesystem moves and
don't follow links
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit f7723293a07d1b7a4f3476939590fa8db6080d06
Author: Bo Yang boy...@samba.org
Date: Thu Dec 10 14:30:13 2009 +0800
s3: Give the user a chance to change password when password will expire
soon.
Signed-off-by: Bo Yang boy...@samba.org
---
Summary of changes:
nsswitch/pam_winbind.c | 120 +++
1 files changed, 109 insertions(+), 11 deletions(-)
Changeset truncated at 500 lines:
diff --git a/nsswitch/pam_winbind.c b/nsswitch/pam_winbind.c
index 667be15..2563f38 100644
--- a/nsswitch/pam_winbind.c
+++ b/nsswitch/pam_winbind.c
@@ -807,6 +807,37 @@ static int wbc_auth_error_to_pam_error(struct pwb_context
*ctx,
return pam_winbind_request_log(ctx, ret, username, fn);
}
+static bool _pam_winbind_change_pwd(struct pwb_context *ctx)
+{
+ struct pam_message msg, *pmsg;
+ struct pam_response *resp = NULL;
+ const char *prompt;
+ int ret;
+ bool retval = false;
+ prompt = _(Do you want to change your password now?);
+ pmsg = msg;
+ msg.msg_style = PAM_RADIO_TYPE;
+ msg.msg = prompt;
+ ret = converse(ctx-pamh, 1, pmsg, resp);
+ if (resp == NULL) {
+ if (ret == PAM_SUCCESS) {
+ _pam_log(ctx, LOG_CRIT, pam_winbind: system error!\n);
+ return false;
+ }
+ }
+ if (ret != PAM_SUCCESS) {
+ return false;
+ }
+ _pam_log(ctx, LOG_CRIT, Received [%s] reply from application.\n,
resp-resp);
+
+ if (strcasecmp(resp-resp, yes) == 0) {
+ retval = true;
+ }
+
+ _pam_drop_reply(resp, 1);
+ return retval;
+}
+
/**
* send a password expiry message if required
@@ -823,15 +854,22 @@ static bool _pam_send_password_expiry_message(struct
pwb_context *ctx,
time_t next_change,
time_t now,
int warn_pwd_expire,
- bool *already_expired)
+ bool *already_expired,
+ bool *change_pwd)
{
int days = 0;
struct tm tm_now, tm_next_change;
+ bool retval = false;
+ int ret;
if (already_expired) {
*already_expired = false;
}
+ if (change_pwd) {
+ *change_pwd = false;
+ }
+
if (next_change = now) {
PAM_WB_REMARK_DIRECT(ctx, NT_STATUS_PASSWORD_EXPIRED);
if (already_expired) {
@@ -854,15 +892,61 @@ static bool _pam_send_password_expiry_message(struct
pwb_context *ctx,
(tm_now.tm_yday+tm_now.tm_year*365);
if (days == 0) {
- _make_remark(ctx, PAM_TEXT_INFO,
-_(Your password expires today));
+ ret = _make_remark(ctx, PAM_TEXT_INFO,
+ _(Your password expires today.\n));
+
+ /*
+* If change_pwd and already_expired is null.
+* We are just sending a notification message.
+* We don't expect any response in this case.
+*/
+
+ if (!change_pwd !already_expired) {
+ return true;
+ }
+
+ /*
+* successfully sent the warning message.
+* Give the user a chance to change pwd.
+*/
+ if (ret == PAM_SUCCESS) {
+ if (change_pwd) {
+ retval = _pam_winbind_change_pwd(ctx);
+ if (retval) {
+ *change_pwd = true;
+ }
+ }
+ }
return true;
}
if (days 0 days warn_pwd_expire) {
- _make_remark_format(ctx, PAM_TEXT_INFO,
- _(Your password will expire in %d %s),
- days, (days 1) ? _(days):_(day));
+
+ ret = _make_remark_format(ctx, PAM_TEXT_INFO,
+ _(Your password will expire in %d
%s.\n),
+ days, (days 1) ? _(days):_(day));
+ /*
+* If change_pwd and already_expired is null.
+* We are just sending a notification message
[SCM] Samba Shared Repository - branch v3-5-test updated
The branch, v3-5-test has been updated
via 7097f61... s3: Give the user a chance to change password when
password will expire soon.
from 2a6391b... s3:doc: make dos filetimes description less contradictory
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-5-test
- Log -
commit 7097f6101e52220f7ff0ef821efa5b1810b2604d
Author: Bo Yang boy...@samba.org
Date: Thu Dec 10 14:30:13 2009 +0800
s3: Give the user a chance to change password when password will expire
soon.
Signed-off-by: Bo Yang boy...@samba.org
(cherry picked from commit f7723293a07d1b7a4f3476939590fa8db6080d06)
---
Summary of changes:
nsswitch/pam_winbind.c | 120 +++
1 files changed, 109 insertions(+), 11 deletions(-)
Changeset truncated at 500 lines:
diff --git a/nsswitch/pam_winbind.c b/nsswitch/pam_winbind.c
index be9468c..f82a7be 100644
--- a/nsswitch/pam_winbind.c
+++ b/nsswitch/pam_winbind.c
@@ -807,6 +807,37 @@ static int wbc_auth_error_to_pam_error(struct pwb_context
*ctx,
return pam_winbind_request_log(ctx, ret, username, fn);
}
+static bool _pam_winbind_change_pwd(struct pwb_context *ctx)
+{
+ struct pam_message msg, *pmsg;
+ struct pam_response *resp = NULL;
+ const char *prompt;
+ int ret;
+ bool retval = false;
+ prompt = _(Do you want to change your password now?);
+ pmsg = msg;
+ msg.msg_style = PAM_RADIO_TYPE;
+ msg.msg = prompt;
+ ret = converse(ctx-pamh, 1, pmsg, resp);
+ if (resp == NULL) {
+ if (ret == PAM_SUCCESS) {
+ _pam_log(ctx, LOG_CRIT, pam_winbind: system error!\n);
+ return false;
+ }
+ }
+ if (ret != PAM_SUCCESS) {
+ return false;
+ }
+ _pam_log(ctx, LOG_CRIT, Received [%s] reply from application.\n,
resp-resp);
+
+ if (strcasecmp(resp-resp, yes) == 0) {
+ retval = true;
+ }
+
+ _pam_drop_reply(resp, 1);
+ return retval;
+}
+
/**
* send a password expiry message if required
@@ -823,15 +854,22 @@ static bool _pam_send_password_expiry_message(struct
pwb_context *ctx,
time_t next_change,
time_t now,
int warn_pwd_expire,
- bool *already_expired)
+ bool *already_expired,
+ bool *change_pwd)
{
int days = 0;
struct tm tm_now, tm_next_change;
+ bool retval = false;
+ int ret;
if (already_expired) {
*already_expired = false;
}
+ if (change_pwd) {
+ *change_pwd = false;
+ }
+
if (next_change = now) {
PAM_WB_REMARK_DIRECT(ctx, NT_STATUS_PASSWORD_EXPIRED);
if (already_expired) {
@@ -854,15 +892,61 @@ static bool _pam_send_password_expiry_message(struct
pwb_context *ctx,
(tm_now.tm_yday+tm_now.tm_year*365);
if (days == 0) {
- _make_remark(ctx, PAM_TEXT_INFO,
-_(Your password expires today));
+ ret = _make_remark(ctx, PAM_TEXT_INFO,
+ _(Your password expires today.\n));
+
+ /*
+* If change_pwd and already_expired is null.
+* We are just sending a notification message.
+* We don't expect any response in this case.
+*/
+
+ if (!change_pwd !already_expired) {
+ return true;
+ }
+
+ /*
+* successfully sent the warning message.
+* Give the user a chance to change pwd.
+*/
+ if (ret == PAM_SUCCESS) {
+ if (change_pwd) {
+ retval = _pam_winbind_change_pwd(ctx);
+ if (retval) {
+ *change_pwd = true;
+ }
+ }
+ }
return true;
}
if (days 0 days warn_pwd_expire) {
- _make_remark_format(ctx, PAM_TEXT_INFO,
- _(Your password will expire in %d %s),
- days, (days 1) ? _(days):_(day));
+
+ ret = _make_remark_format(ctx, PAM_TEXT_INFO,
+ _(Your password will expire in %d
%s.\n),
+ days, (days 1) ? _(days):_(day));
+ /*
+* If change_pwd and already_expired is null
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via cdb68bd... s3: Fix crash in winbindd;(bug#6879).
from dfcc411... Remove unneeded argument from can_set_delete_on_close().
Ensure can_set_delete_on_close() is correctly called before any setting of the
disposition bit (clean up the do_unlink() call). Jeremy.
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit cdb68bd2b61147df77b7f2de3fb4e29be07e7bd9
Author: Bo Yang boy...@samba.org
Date: Fri Dec 4 12:53:38 2009 +0800
s3: Fix crash in winbindd;(bug#6879).
Signed-off-by: Bo Yang boy...@samba.org
---
Summary of changes:
source3/winbindd/winbindd_rpc.c | 10 --
1 files changed, 8 insertions(+), 2 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/winbindd/winbindd_rpc.c b/source3/winbindd/winbindd_rpc.c
index b926370..1018a29 100644
--- a/source3/winbindd/winbindd_rpc.c
+++ b/source3/winbindd/winbindd_rpc.c
@@ -1281,8 +1281,12 @@ NTSTATUS winbindd_lookup_names(TALLOC_CTX *mem_ctx,
* This call can take a long time
* allow the server to time out.
* 35 seconds should do it.
+* NB
+* only do this when the undelying transport is named pipe.
*/
- orig_timeout = rpccli_set_timeout(cli, 35000);
+ if (cli-transport-transport == NCACN_NP) {
+ orig_timeout = rpccli_set_timeout(cli, 35000);
+ }
status = lookup_names_fn(cli,
mem_ctx,
@@ -1295,7 +1299,9 @@ NTSTATUS winbindd_lookup_names(TALLOC_CTX *mem_ctx,
types);
/* And restore our original timeout. */
- rpccli_set_timeout(cli, orig_timeout);
+ if (cli-transport-transport == NCACN_NP) {
+ rpccli_set_timeout(cli, orig_timeout);
+ }
if (!NT_STATUS_IS_OK(status)) {
return status;
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch v3-5-test updated
The branch, v3-5-test has been updated
via 3c4f74b... s3: Fix crash in winbindd;(bug#6879).
from baa4727... Remove unneeded argument from can_set_delete_on_close().
Ensure can_set_delete_on_close() is correctly called before any setting of the
disposition bit (clean up the do_unlink() call). Jeremy. (cherry picked from
commit dfcc4115ddc7c3bf7a69d7eb747c096cd217b8a6)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-5-test
- Log -
commit 3c4f74bbcbe7c9c7e50865adac2db70e48a2d82f
Author: Bo Yang boy...@samba.org
Date: Fri Dec 4 12:53:38 2009 +0800
s3: Fix crash in winbindd;(bug#6879).
Signed-off-by: Bo Yang boy...@samba.org
(cherry picked from commit cdb68bd2b61147df77b7f2de3fb4e29be07e7bd9)
---
Summary of changes:
source3/winbindd/winbindd_rpc.c | 10 --
1 files changed, 8 insertions(+), 2 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/winbindd/winbindd_rpc.c b/source3/winbindd/winbindd_rpc.c
index d4e2ff2..b6cb56e 100644
--- a/source3/winbindd/winbindd_rpc.c
+++ b/source3/winbindd/winbindd_rpc.c
@@ -1276,8 +1276,12 @@ NTSTATUS winbindd_lookup_names(TALLOC_CTX *mem_ctx,
* This call can take a long time
* allow the server to time out.
* 35 seconds should do it.
+* NB
+* only do this when the undelying transport is named pipe.
*/
- orig_timeout = rpccli_set_timeout(cli, 35000);
+ if (cli-transport-transport == NCACN_NP) {
+ orig_timeout = rpccli_set_timeout(cli, 35000);
+ }
status = lookup_names_fn(cli,
mem_ctx,
@@ -1290,7 +1294,9 @@ NTSTATUS winbindd_lookup_names(TALLOC_CTX *mem_ctx,
types);
/* And restore our original timeout. */
- rpccli_set_timeout(cli, orig_timeout);
+ if (cli-transport-transport == NCACN_NP) {
+ rpccli_set_timeout(cli, orig_timeout);
+ }
if (!NT_STATUS_IS_OK(status)) {
return status;
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via 62a2732... s3: Fix crash in free_file_list().
from b03ad70... s3:docs: Document enable core files.
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 62a27325d99cf4371fe98d049110e585dd209c98
Author: Bo Yang boy...@samba.org
Date: Mon Nov 30 17:30:25 2009 +0800
s3: Fix crash in free_file_list().
Signed-off-by: Bo Yang boy...@samba.org
---
Summary of changes:
source3/param/loadparm.c |7 ---
1 files changed, 4 insertions(+), 3 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c
index 29e3a25..a1f5328 100644
--- a/source3/param/loadparm.c
+++ b/source3/param/loadparm.c
@@ -7016,6 +7016,7 @@ static void add_to_file_list(const char *fname, const
char *subfname)
}
f-subfname = SMB_STRDUP(subfname);
if (!f-subfname) {
+ SAFE_FREE(f-name);
SAFE_FREE(f);
return;
}
@@ -7026,6 +7027,7 @@ static void add_to_file_list(const char *fname, const
char *subfname)
if (t)
f-modtime = t;
}
+ return;
}
/**
@@ -7113,9 +7115,8 @@ bool lp_file_list_changed(void)
ctime(mod_time)));
f-modtime = mod_time;
SAFE_FREE(f-subfname);
- f-subfname = n2; /* Passing ownership of
-return from alloc_sub_basic
-above. */
+ f-subfname = SMB_STRDUP(n2);
+ TALLOC_FREE(n2);
return true;
}
TALLOC_FREE(n2);
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch v3-5-test updated
The branch, v3-5-test has been updated
via 9b5f8eb... s3: Fix crash in free_file_list().
from 15f7b70... s3:docs: Document enable core files.
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-5-test
- Log -
commit 9b5f8eb59ed7f65d4c017cd6a9dc668ebf3115b6
Author: Bo Yang boy...@samba.org
Date: Mon Nov 30 17:30:25 2009 +0800
s3: Fix crash in free_file_list().
Signed-off-by: Bo Yang boy...@samba.org
(cherry picked from commit 62a27325d99cf4371fe98d049110e585dd209c98)
---
Summary of changes:
source3/param/loadparm.c |7 ---
1 files changed, 4 insertions(+), 3 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c
index 9da853f..1c79ff6 100644
--- a/source3/param/loadparm.c
+++ b/source3/param/loadparm.c
@@ -7016,6 +7016,7 @@ static void add_to_file_list(const char *fname, const
char *subfname)
}
f-subfname = SMB_STRDUP(subfname);
if (!f-subfname) {
+ SAFE_FREE(f-name);
SAFE_FREE(f);
return;
}
@@ -7026,6 +7027,7 @@ static void add_to_file_list(const char *fname, const
char *subfname)
if (t)
f-modtime = t;
}
+ return;
}
/**
@@ -7112,9 +7114,8 @@ bool lp_file_list_changed(void)
ctime(mod_time)));
f-modtime = mod_time;
SAFE_FREE(f-subfname);
- f-subfname = n2; /* Passing ownership of
-return from alloc_sub_basic
-above. */
+ f-subfname = SMB_STRDUP(n2);
+ TALLOC_FREE(n2);
return true;
}
SAFE_FREE(n2);
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch v3-5-test updated
The branch, v3-5-test has been updated
via 509b424... s3: Fix commit 9b5f8eb59ed7f65d4c017cd6a9dc668ebf3115b6.
from e1468d0... s4-smbtorture: more and stricter tests for printer and
data keys in RPC-SPOOLSS.
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-5-test
- Log -
commit 509b42486e5f98343d95100c12969703398a248d
Author: Bo Yang boy...@samba.org
Date: Mon Nov 30 19:39:33 2009 +0800
s3: Fix commit 9b5f8eb59ed7f65d4c017cd6a9dc668ebf3115b6.
Signed-off-by: Bo Yang boy...@samba.org
---
Summary of changes:
source3/param/loadparm.c |4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c
index 1c79ff6..641f7ad 100644
--- a/source3/param/loadparm.c
+++ b/source3/param/loadparm.c
@@ -7093,7 +7093,7 @@ bool lp_file_list_changed(void)
return true;
}
} else {
- n2 = alloc_sub_basic(get_current_username(),
+ n2 = talloc_sub_basic(get_current_username(),
current_user_info.domain,
f-name);
if (!n2) {
@@ -7118,7 +7118,7 @@ bool lp_file_list_changed(void)
TALLOC_FREE(n2);
return true;
}
- SAFE_FREE(n2);
+ TALLOC_FREE(n2);
}
f = f-next;
}
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch v3-5-test updated
The branch, v3-5-test has been updated
via f9651fc... Revert s3: Fix commit
9b5f8eb59ed7f65d4c017cd6a9dc668ebf3115b6.
via cdbf770... Revert s3: Fix crash in free_file_list().
from 54e2e0a... s3:docs: Fix typo in man mount.cifs.
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-5-test
- Log -
commit f9651fcd867293fb0364729e220ee81c3f7a72af
Author: Bo Yang boy...@samba.org
Date: Tue Dec 1 01:05:35 2009 +0800
Revert s3: Fix commit 9b5f8eb59ed7f65d4c017cd6a9dc668ebf3115b6.
This reverts commit 509b42486e5f98343d95100c12969703398a248d.
commit cdbf7708c219f12432c8cac237dd9c1144b8ee22
Author: Bo Yang boy...@samba.org
Date: Tue Dec 1 01:05:10 2009 +0800
Revert s3: Fix crash in free_file_list().
This reverts commit 9b5f8eb59ed7f65d4c017cd6a9dc668ebf3115b6.
---
Summary of changes:
source3/param/loadparm.c | 11 +--
1 files changed, 5 insertions(+), 6 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c
index 641f7ad..9da853f 100644
--- a/source3/param/loadparm.c
+++ b/source3/param/loadparm.c
@@ -7016,7 +7016,6 @@ static void add_to_file_list(const char *fname, const
char *subfname)
}
f-subfname = SMB_STRDUP(subfname);
if (!f-subfname) {
- SAFE_FREE(f-name);
SAFE_FREE(f);
return;
}
@@ -7027,7 +7026,6 @@ static void add_to_file_list(const char *fname, const
char *subfname)
if (t)
f-modtime = t;
}
- return;
}
/**
@@ -7093,7 +7091,7 @@ bool lp_file_list_changed(void)
return true;
}
} else {
- n2 = talloc_sub_basic(get_current_username(),
+ n2 = alloc_sub_basic(get_current_username(),
current_user_info.domain,
f-name);
if (!n2) {
@@ -7114,11 +7112,12 @@ bool lp_file_list_changed(void)
ctime(mod_time)));
f-modtime = mod_time;
SAFE_FREE(f-subfname);
- f-subfname = SMB_STRDUP(n2);
- TALLOC_FREE(n2);
+ f-subfname = n2; /* Passing ownership of
+return from alloc_sub_basic
+above. */
return true;
}
- TALLOC_FREE(n2);
+ SAFE_FREE(n2);
}
f = f-next;
}
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via b9a3f1d... s3: Fix crash in pam_winbind, another reference to freed
memory.
from 3050f83... s4-python: we need to include Python.h first
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit b9a3f1dd85d168c15df846dba525f4f882d1acf8
Author: Bo Yang boy...@samba.org
Date: Sat Oct 24 09:20:00 2009 +0800
s3: Fix crash in pam_winbind, another reference to freed memory.
Signed-off-by: Bo Yang boy...@samba.org
---
Summary of changes:
nsswitch/pam_winbind.c | 10 +++---
1 files changed, 7 insertions(+), 3 deletions(-)
Changeset truncated at 500 lines:
diff --git a/nsswitch/pam_winbind.c b/nsswitch/pam_winbind.c
index a2d3729..93df55d 100644
--- a/nsswitch/pam_winbind.c
+++ b/nsswitch/pam_winbind.c
@@ -1788,7 +1788,7 @@ static int winbind_auth_request(struct pwb_context *ctx,
if (logon.blobs) {
wbcFreeMemory(logon.blobs);
}
- if (info info-blobs) {
+ if (info info-blobs !p_info) {
wbcFreeMemory(info-blobs);
}
if (error !p_error) {
@@ -3141,10 +3141,14 @@ int pam_sm_chauthtok(pam_handle_t * pamh, int flags,
free(username_ret);
}
- wbcFreeMemory(info);
- wbcFreeMemory(policy);
}
+ if (info info-blobs) {
+ wbcFreeMemory(info-blobs);
+ }
+ wbcFreeMemory(info);
+ wbcFreeMemory(policy);
+
goto out;
}
} else {
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch v3-5-test updated
The branch, v3-5-test has been updated
via b46f0a7... s3: Fix crash in pam_winbind, another reference to freed
memory.
from 2b02c97... Simplify the logic. Jeremy.
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-5-test
- Log -
commit b46f0a7bda7101517435ef612c68e81976d15102
Author: Bo Yang boy...@samba.org
Date: Sat Oct 24 09:20:00 2009 +0800
s3: Fix crash in pam_winbind, another reference to freed memory.
Signed-off-by: Bo Yang boy...@samba.org
(cherry picked from commit b9a3f1dd85d168c15df846dba525f4f882d1acf8)
---
Summary of changes:
nsswitch/pam_winbind.c | 10 +++---
1 files changed, 7 insertions(+), 3 deletions(-)
Changeset truncated at 500 lines:
diff --git a/nsswitch/pam_winbind.c b/nsswitch/pam_winbind.c
index 0eb24a2..7694251 100644
--- a/nsswitch/pam_winbind.c
+++ b/nsswitch/pam_winbind.c
@@ -1788,7 +1788,7 @@ static int winbind_auth_request(struct pwb_context *ctx,
if (logon.blobs) {
wbcFreeMemory(logon.blobs);
}
- if (info info-blobs) {
+ if (info info-blobs !p_info) {
wbcFreeMemory(info-blobs);
}
if (error !p_error) {
@@ -3141,10 +3141,14 @@ int pam_sm_chauthtok(pam_handle_t * pamh, int flags,
free(username_ret);
}
- wbcFreeMemory(info);
- wbcFreeMemory(policy);
}
+ if (info info-blobs) {
+ wbcFreeMemory(info-blobs);
+ }
+ wbcFreeMemory(info);
+ wbcFreeMemory(policy);
+
goto out;
}
} else {
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via 31f1a36... s3: Don't fail authentication when one or some group of
require-membership-of is invalid.
from 1219dac... s4-pvfs: fixed uninitialised variable
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 31f1a36901b5b8959dc51401c09c114829b50392
Author: Bo Yang boy...@samba.org
Date: Thu Oct 15 06:23:48 2009 +0800
s3: Don't fail authentication when one or some group of
require-membership-of is invalid.
Signed-off-by: Bo Yang boy...@samba.org
---
Summary of changes:
nsswitch/pam_winbind.c | 25 +++--
1 files changed, 23 insertions(+), 2 deletions(-)
Changeset truncated at 500 lines:
diff --git a/nsswitch/pam_winbind.c b/nsswitch/pam_winbind.c
index fdb5be3..a2d3729 100644
--- a/nsswitch/pam_winbind.c
+++ b/nsswitch/pam_winbind.c
@@ -1057,7 +1057,23 @@ static bool winbind_name_list_to_sid_string_list(struct
pwb_context *ctx,
current_name,
sid_list_buffer,
sid_list_buffer_size)) {
- goto out;
+ /*
+* If one group name failed, we must not fail
+* the authentication totally, continue with
+* the following group names. If user belongs to
+* one of the valid groups, we must allow it
+* login. -- BoYang
+*/
+
+ _pam_log(ctx, LOG_INFO, cannot convert group %s to
sid,
+check if group %s is valid group.,
current_name,
+current_name);
+ _make_remark_format(ctx, PAM_TEXT_INFO, _(Cannot
convert group %s
+ to sid, please contact your
administrator to see
+ if group %s is valid.), current_name,
current_name);
+ SAFE_FREE(current_name);
+ search_location = comma + 1;
+ continue;
}
SAFE_FREE(current_name);
@@ -1073,7 +1089,12 @@ static bool winbind_name_list_to_sid_string_list(struct
pwb_context *ctx,
if (!winbind_name_to_sid_string(ctx, user, search_location,
sid_list_buffer,
sid_list_buffer_size)) {
- goto out;
+ _pam_log(ctx, LOG_INFO, cannot convert group %s to sid,
+check if group %s is valid group., search_location,
+search_location);
+ _make_remark_format(ctx, PAM_TEXT_INFO, _(Cannot convert group
%s
+ to sid, please contact your administrator to
see
+ if group %s is valid.), search_location,
search_location);
}
result = true;
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch v3-5-test updated
The branch, v3-5-test has been updated
via 5d62b2f... s3: Don't fail authentication when one or some group of
require-membership-of is invalid.
from 3555704... s3:configure: fix avahi activation
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-5-test
- Log -
commit 5d62b2fcce7d846bf5adb4407c05d281afa6a9e9
Author: Bo Yang boy...@samba.org
Date: Thu Oct 15 06:23:48 2009 +0800
s3: Don't fail authentication when one or some group of
require-membership-of is invalid.
Signed-off-by: Bo Yang boy...@samba.org
(cherry picked from commit 31f1a36901b5b8959dc51401c09c114829b50392)
---
Summary of changes:
nsswitch/pam_winbind.c | 25 +++--
1 files changed, 23 insertions(+), 2 deletions(-)
Changeset truncated at 500 lines:
diff --git a/nsswitch/pam_winbind.c b/nsswitch/pam_winbind.c
index 0b00c95..0eb24a2 100644
--- a/nsswitch/pam_winbind.c
+++ b/nsswitch/pam_winbind.c
@@ -1057,7 +1057,23 @@ static bool winbind_name_list_to_sid_string_list(struct
pwb_context *ctx,
current_name,
sid_list_buffer,
sid_list_buffer_size)) {
- goto out;
+ /*
+* If one group name failed, we must not fail
+* the authentication totally, continue with
+* the following group names. If user belongs to
+* one of the valid groups, we must allow it
+* login. -- BoYang
+*/
+
+ _pam_log(ctx, LOG_INFO, cannot convert group %s to
sid,
+check if group %s is valid group.,
current_name,
+current_name);
+ _make_remark_format(ctx, PAM_TEXT_INFO, _(Cannot
convert group %s
+ to sid, please contact your
administrator to see
+ if group %s is valid.), current_name,
current_name);
+ SAFE_FREE(current_name);
+ search_location = comma + 1;
+ continue;
}
SAFE_FREE(current_name);
@@ -1073,7 +1089,12 @@ static bool winbind_name_list_to_sid_string_list(struct
pwb_context *ctx,
if (!winbind_name_to_sid_string(ctx, user, search_location,
sid_list_buffer,
sid_list_buffer_size)) {
- goto out;
+ _pam_log(ctx, LOG_INFO, cannot convert group %s to sid,
+check if group %s is valid group., search_location,
+search_location);
+ _make_remark_format(ctx, PAM_TEXT_INFO, _(Cannot convert group
%s
+ to sid, please contact your administrator to
see
+ if group %s is valid.), search_location,
search_location);
}
result = true;
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via 8e91c40... s3: Fix reference to freed memory in pam_winbind.
from e0e7ca4... Revert s4:hdb-samba4 - Don't double-free db
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 8e91c40574ce30a053ff8979e69205d15fb89a5c
Author: Bo Yang boy...@samba.org
Date: Thu Oct 15 04:31:26 2009 +0800
s3: Fix reference to freed memory in pam_winbind.
Signed-off-by: Bo Yang boy...@samba.org
---
Summary of changes:
nsswitch/pam_winbind.c |5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
Changeset truncated at 500 lines:
diff --git a/nsswitch/pam_winbind.c b/nsswitch/pam_winbind.c
index 654b438..fd06688 100644
--- a/nsswitch/pam_winbind.c
+++ b/nsswitch/pam_winbind.c
@@ -981,6 +981,7 @@ static bool winbind_name_to_sid_string(struct pwb_context
*ctx,
int sid_list_buffer_size)
{
const char* sid_string;
+ char *sid_str;
/* lookup name? */
if (IS_SID_STRING(name)) {
@@ -989,7 +990,6 @@ static bool winbind_name_to_sid_string(struct pwb_context
*ctx,
wbcErr wbc_status;
struct wbcDomainSid sid;
enum wbcSidType type;
- char *sid_str;
_pam_log_debug(ctx, LOG_DEBUG,
no sid given, looking up: %s\n, name);
@@ -1006,15 +1006,16 @@ static bool winbind_name_to_sid_string(struct
pwb_context *ctx,
return false;
}
- wbcFreeMemory(sid_str);
sid_string = sid_str;
}
if (!safe_append_string(sid_list_buffer, sid_string,
sid_list_buffer_size)) {
+ wbcFreeMemory(sid_str);
return false;
}
+ wbcFreeMemory(sid_str);
return true;
}
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch v3-5-test updated - release-4-0-0alpha8-1463-g50268ab
The branch, v3-5-test has been updated
via 50268ab18489b3508cf2ef35069dc0bcb585fbd9 (commit)
from dbebf4d848e72fe1b9bf117e05240b95d89fc93b (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-5-test
- Log -
commit 50268ab18489b3508cf2ef35069dc0bcb585fbd9
Author: Bo Yang boy...@samba.org
Date: Wed Sep 16 23:54:46 2009 +0800
s3: Don't overwrite password in pam_winbind, subsequent pam modules might
use the old password and new password.
Signed-off-by: Bo Yang boy...@samba.org
---
Summary of changes:
nsswitch/pam_winbind.c |4
1 files changed, 0 insertions(+), 4 deletions(-)
Changeset truncated at 500 lines:
diff --git a/nsswitch/pam_winbind.c b/nsswitch/pam_winbind.c
index 4e84574..324bede 100644
--- a/nsswitch/pam_winbind.c
+++ b/nsswitch/pam_winbind.c
@@ -3059,8 +3059,6 @@ int pam_sm_chauthtok(pam_handle_t * pamh, int flags,
ret = winbind_chauthtok_request(ctx, user, pass_old,
pass_new, pwdlastset_update);
if (ret) {
- _pam_overwrite(pass_new);
- _pam_overwrite(pass_old);
pass_old = pass_new = NULL;
goto out;
}
@@ -3089,8 +3087,6 @@ int pam_sm_chauthtok(pam_handle_t * pamh, int flags,
member, cctype, 0,
error, info, policy,
NULL, username_ret);
- _pam_overwrite(pass_new);
- _pam_overwrite(pass_old);
pass_old = pass_new = NULL;
if (ret == PAM_SUCCESS) {
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated - tevent-0-9-8-365-g89ed2af
The branch, master has been updated
via 89ed2af69d6d6adcaf64d4c576ee8ba41b27b8a5 (commit)
from 45cebf7f113c3ff3c1b029c591d879b992f8 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 89ed2af69d6d6adcaf64d4c576ee8ba41b27b8a5
Author: Bo Yang boy...@samba.org
Date: Wed Sep 16 22:03:57 2009 +0800
s3: Don't overwrite password in pam_winbind, subsequent pam modules
might use the old password and new password.
Signed-off-by: Bo Yang boy...@samba.org
---
Summary of changes:
nsswitch/pam_winbind.c |4
1 files changed, 0 insertions(+), 4 deletions(-)
Changeset truncated at 500 lines:
diff --git a/nsswitch/pam_winbind.c b/nsswitch/pam_winbind.c
index 4e84574..324bede 100644
--- a/nsswitch/pam_winbind.c
+++ b/nsswitch/pam_winbind.c
@@ -3059,8 +3059,6 @@ int pam_sm_chauthtok(pam_handle_t * pamh, int flags,
ret = winbind_chauthtok_request(ctx, user, pass_old,
pass_new, pwdlastset_update);
if (ret) {
- _pam_overwrite(pass_new);
- _pam_overwrite(pass_old);
pass_old = pass_new = NULL;
goto out;
}
@@ -3089,8 +3087,6 @@ int pam_sm_chauthtok(pam_handle_t * pamh, int flags,
member, cctype, 0,
error, info, policy,
NULL, username_ret);
- _pam_overwrite(pass_new);
- _pam_overwrite(pass_old);
pass_old = pass_new = NULL;
if (ret == PAM_SUCCESS) {
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha8-867-g238bf25
The branch, master has been updated
via 238bf25af44ecc51bef59f1d0b9303da9904432e (commit)
via b9fb8da59148f574b03e44748fca7800f940db7a (commit)
from 4aad79041b2ababc3336db3bea90f115c5634427 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 238bf25af44ecc51bef59f1d0b9303da9904432e
Author: Bo Yang boy...@samba.org
Date: Sat Aug 8 06:14:33 2009 +0800
s3: add a test to test libsmbclient
Signed-off-by: Bo Yang boy...@samba.org
commit b9fb8da59148f574b03e44748fca7800f940db7a
Author: Bo Yang boy...@samba.org
Date: Sat Aug 8 06:10:37 2009 +0800
s3: Fix nss info substitution
Signed-off-by: Bo Yang boy...@samba.org
---
Summary of changes:
source3/winbindd/wb_getpwsid.c |6 +-
testsuite/libsmbclient/src/Makefile |9 ++-
testsuite/libsmbclient/src/stat/stat_k.c | 91 ++
3 files changed, 101 insertions(+), 5 deletions(-)
create mode 100644 testsuite/libsmbclient/src/stat/stat_k.c
Changeset truncated at 500 lines:
diff --git a/source3/winbindd/wb_getpwsid.c b/source3/winbindd/wb_getpwsid.c
index a823ba3..fc696cb 100644
--- a/source3/winbindd/wb_getpwsid.c
+++ b/source3/winbindd/wb_getpwsid.c
@@ -191,7 +191,7 @@ static void wb_getpwsid_sid2gid_done(struct tevent_req
*subreq)
fstrcpy(state-pw-pw_passwd, *);
fstrcpy(state-pw-pw_gecos, state-userinfo-full_name);
- if (!fillup_pw_field(lp_template_homedir(), state-pw-pw_name,
+ if (!fillup_pw_field(lp_template_homedir(), username,
state-user_domain-name, state-pw-pw_uid,
state-pw-pw_gid, state-userinfo-homedir,
state-pw-pw_dir)) {
@@ -200,9 +200,9 @@ static void wb_getpwsid_sid2gid_done(struct tevent_req
*subreq)
return;
}
- if (!fillup_pw_field(lp_template_homedir(), state-pw-pw_name,
+ if (!fillup_pw_field(lp_template_shell(), state-pw-pw_name,
state-user_domain-name, state-pw-pw_uid,
-state-pw-pw_gid, state-userinfo-homedir,
+state-pw-pw_gid, state-userinfo-shell,
state-pw-pw_shell)) {
DEBUG(5, (Could not compose shell\n));
tevent_req_nterror(req, NT_STATUS_NO_MEMORY);
diff --git a/testsuite/libsmbclient/src/Makefile
b/testsuite/libsmbclient/src/Makefile
index 8b4658f..c8c0b67 100644
--- a/testsuite/libsmbclient/src/Makefile
+++ b/testsuite/libsmbclient/src/Makefile
@@ -2,7 +2,7 @@ CC = gcc
CFLAGS = -Wall -W -O2 -g -I../../../source/include
LFLAGS = -L../../../source/bin
-LIBS= -L/usr/lib -lsmbclient
+LIBS= -L/usr/lib -lsmbclient -ltalloc
INCPATH= -I. -I/usr/include -I./include
BIN_DIR=bin
@@ -99,7 +99,8 @@ G_STAT= $(BIN_DIR)/stat_1 \
$(BIN_DIR)/stat_3 \
$(BIN_DIR)/stat_4 \
$(BIN_DIR)/stat_5 \
- $(BIN_DIR)/stat_6
+ $(BIN_DIR)/stat_6 \
+ $(BIN_DIR)/stat_k
G_GETDENTS = $(BIN_DIR)/getdents_1 \
$(BIN_DIR)/getdents_2 \
@@ -521,6 +522,10 @@ $(BIN_DIR)/stat_6: stat/stat_6.o
@echo Linking $@
@$(CC) $(LFLAGS) -o $@ stat/stat_6.o $(INCPATH) $(LIBS)
+$(BIN_DIR)/stat_k: stat/stat_k.o
+ @echo Linking $@
+ @$(CC) $(LFLAGS) -o $@ stat/stat_k.o $(INCPATH) $(LIBS)
+
$(BIN_DIR)/getdents_1: getdents/getdents_1.o
@echo Linking $@
@$(CC) $(LFLAGS) -o $@ getdents/getdents_1.o $(INCPATH) $(LIBS)
diff --git a/testsuite/libsmbclient/src/stat/stat_k.c
b/testsuite/libsmbclient/src/stat/stat_k.c
new file mode 100644
index 000..168ccae
--- /dev/null
+++ b/testsuite/libsmbclient/src/stat/stat_k.c
@@ -0,0 +1,91 @@
+#include stdio.h
+#include stdlib.h
+#include string.h
+#include errno.h
+#include unistd.h
+#include libsmbclient.h
+
+#defineMAX_BUFF_SIZE 255
+char g_workgroup[MAX_BUFF_SIZE];
+char g_username[MAX_BUFF_SIZE];
+char g_password[MAX_BUFF_SIZE];
+char g_server[MAX_BUFF_SIZE];
+char g_share[MAX_BUFF_SIZE];
+
+
+void auth_fn(const char *server, const char *share, char *workgroup, int
wgmaxlen,
+ char *username, int unmaxlen, char *password, int pwmaxlen)
+{
+
+ strncpy(workgroup, g_workgroup, wgmaxlen - 1);
+
+ strncpy(username, g_username, unmaxlen - 1);
+
+ strncpy(password, g_password, pwmaxlen - 1);
+
+ strcpy(g_server, server);
+ strcpy(g_share, share);
+
+}
+
+int main(int argc, char** argv)
+{
+ int err = -1;
+ char url[MAX_BUFF_SIZE];
+ struct stat st;
+ char *user;
+ SMBCCTX *ctx;
+
+ bzero(g_workgroup,MAX_BUFF_SIZE);
+ bzero(url
[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha8-854-g857140a
The branch, master has been updated
via 857140a79fb9cd186ed7f33aaf92934080256a3c (commit)
from 915b789c874e661dbd240e1fe3ba35f67746fdd0 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 857140a79fb9cd186ed7f33aaf92934080256a3c
Author: Bo Yang boy...@samba.org
Date: Fri Aug 7 13:42:51 2009 +0800
Unable to browse DFS when using kerberos
Signed-off-by: Bo Yang boy...@samba.org
---
Summary of changes:
source3/libsmb/libsmb_context.c | 22 ++
1 files changed, 14 insertions(+), 8 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/libsmb/libsmb_context.c b/source3/libsmb/libsmb_context.c
index 8b22ee5..78c9a55 100644
--- a/source3/libsmb/libsmb_context.c
+++ b/source3/libsmb/libsmb_context.c
@@ -692,22 +692,28 @@ void smbc_set_credentials_with_fallback(SMBCCTX *context,
{
smbc_bool use_kerberos = false;
const char *signing_state = off;
- struct user_auth_info *auth_info = user_auth_info_init(NULL);
+ struct user_auth_info *auth_info = NULL;
- if (auth_info) {
+ if (! context) {
+
+ return;
+ }
+
+ if (! workgroup || ! *workgroup) {
+ workgroup = smbc_getWorkgroup(context);
}
- if (! context ||
- ! workgroup || ! *workgroup ||
- ! user || ! *user ||
- ! password || ! *password) {
+ if (! user) {
+ user = smbc_getUser(context);
+ }
- return;
+ if (! password) {
+ password = ;
}
auth_info = user_auth_info_init(NULL);
- if (auth_info) {
+ if (! auth_info) {
DEBUG(0, (smbc_set_credentials_with_fallback: allocation
fail\n));
return;
}
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha8-762-ge215194
The branch, master has been updated via e21519403318acea3424516afc12730fe9e9d432 (commit) from 4fa28af91db993e3d7d2996287dba97247b87e55 (commit) http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit e21519403318acea3424516afc12730fe9e9d432 Author: Bo Yang boy...@samba.org Date: Mon Aug 3 08:16:21 2009 +0800 s3: check in .po files for pam_winbind. Signed-off-by: Bo Yang boy...@samba.org --- Summary of changes: source3/locale/pam_winbind/ar.po| 153 + source3/locale/pam_winbind/cs.po| 153 + source3/locale/pam_winbind/da.po| 178 ++ source3/locale/pam_winbind/es.po| 153 + source3/locale/pam_winbind/fi.po| 181 ++ source3/locale/pam_winbind/fr.po| 153 + source3/locale/pam_winbind/hu.po| 166 +++ source3/locale/pam_winbind/it.po| 153 + source3/locale/pam_winbind/ja.po| 153 + source3/locale/pam_winbind/ko.po| 153 + source3/locale/pam_winbind/nb.po| 183 +++ source3/locale/pam_winbind/nl.po| 153 + source3/locale/pam_winbind/pl.po| 153 + source3/locale/pam_winbind/pt_BR.po | 153 + source3/locale/pam_winbind/ru.po| 153 + source3/locale/pam_winbind/sv.po| 153 + source3/locale/pam_winbind/zh_CN.po | 153 + source3/locale/pam_winbind/zh_TW.po | 153 + 18 files changed, 2850 insertions(+), 0 deletions(-) create mode 100644 source3/locale/pam_winbind/ar.po create mode 100644 source3/locale/pam_winbind/cs.po create mode 100644 source3/locale/pam_winbind/da.po create mode 100644 source3/locale/pam_winbind/es.po create mode 100644 source3/locale/pam_winbind/fi.po create mode 100644 source3/locale/pam_winbind/fr.po create mode 100644 source3/locale/pam_winbind/hu.po create mode 100644 source3/locale/pam_winbind/it.po create mode 100644 source3/locale/pam_winbind/ja.po create mode 100644 source3/locale/pam_winbind/ko.po create mode 100644 source3/locale/pam_winbind/nb.po create mode 100644 source3/locale/pam_winbind/nl.po create mode 100644 source3/locale/pam_winbind/pl.po create mode 100644 source3/locale/pam_winbind/pt_BR.po create mode 100644 source3/locale/pam_winbind/ru.po create mode 100644 source3/locale/pam_winbind/sv.po create mode 100644 source3/locale/pam_winbind/zh_CN.po create mode 100644 source3/locale/pam_winbind/zh_TW.po Changeset truncated at 500 lines: diff --git a/source3/locale/pam_winbind/ar.po b/source3/locale/pam_winbind/ar.po new file mode 100644 index 000..1cd622b --- /dev/null +++ b/source3/locale/pam_winbind/ar.po @@ -0,0 +1,153 @@ +# This file is distributed under the same license as the package. +# +# Copyright (C) 2009 Lars Mueller l...@samba.org +msgid +msgstr +Project-Id-Version: pam_winbind\n +Report-Msgid-Bugs-To: \n +POT-Creation-Date: 2008-07-16 15:30+0800\n +PO-Revision-Date: 2009-02-06 08:04\n +Last-Translator: Novell Language langu...@novell.com\n +Language-Team: Novell Language langu...@novell.com\n +MIME-Version: 1.0\n +Content-Type: text/plain; charset=UTF-8\n +Content-Transfer-Encoding: 8bit\n + +#: pam_winbind.c:326 +msgid Success +msgstr ÙØ¬Ø§Ø + +#: pam_winbind.c:327 +msgid No primary Domain Controler available +msgstr جÙاز اÙتØÙÙ Ù٠اÙ٠جا٠اÙرئÙس٠غÙر ٠تÙÙر + +#: pam_winbind.c:328 +msgid No domain controllers found +msgstr ÙÙ Ùت٠اÙعثÙر عÙ٠أجÙزة تØÙÙ Ù٠اÙ٠جا٠+ +#: pam_winbind.c:329 +msgid No logon servers +msgstr Ùا تÙجد Ø®Ùاد٠تسجÙ٠اÙدخÙÙ + +#: pam_winbind.c:330 +msgid Password too short +msgstr ÙÙÙ Ø© اÙسر ÙصÙرة جدÙا + +#: pam_winbind.c:331 +msgid The password of this user is too recent to change +msgstr ÙÙÙ Ø© سر Ùذا اÙ٠ستخد٠ØدÙثة جدÙا عÙ٠اÙتغÙÙر + +#: pam_winbind.c:332 +msgid Password is already in password history +msgstr ÙÙÙ Ø© اÙسر Ù ÙجÙدة باÙÙع٠Ù٠سج٠ÙÙ٠ات اÙسر + +#: pam_winbind.c:333 +msgid Your password has expired +msgstr اÙتÙت صÙاØÙØ© ÙÙÙ Ø© اÙسر اÙخاصة ب٠+ +#: pam_winbind.c:334 +msgid You need to change your password now +msgstr ÙÙز٠تغÙÙر ÙÙÙ Ø© اÙسر اÙØ¢Ù + +#: pam_winbind.c:335 +msgid You are not allowed to logon from this workstation +msgstr غÙر ٠س٠ÙØ Ù٠بتسجÙ٠اÙدخÙÙ Ù Ù Ù Øطة اÙع٠٠ÙØ°Ù + +#: pam_winbind.c
[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha8-472-ge7daa0d
The branch, master has been updated
via e7daa0d7049933e5a743f7e6db886f624490c53d (commit)
via 20f40d1c5065d909f4274b86de20fa941fa20405 (commit)
from 5f295eb6f5fe60394b764a2e0bc76b77f6160664 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit e7daa0d7049933e5a743f7e6db886f624490c53d
Author: Bo Yang boy...@samba.org
Date: Sat Jul 18 08:03:57 2009 +0800
s3: don't do this, upper callbacks will check it
Signed-off-by: Bo Yang boy...@samba.org
commit 20f40d1c5065d909f4274b86de20fa941fa20405
Author: Bo Yang boy...@samba.org
Date: Sat Jul 18 08:01:56 2009 +0800
s3: Fix crsh in net usershare list
Signed-off-by: Bo Yang boy...@samba.org
---
Summary of changes:
source3/utils/net_usershare.c|1 +
source3/winbindd/winbindd_dual.c |4
2 files changed, 1 insertions(+), 4 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/utils/net_usershare.c b/source3/utils/net_usershare.c
index d82d30b..6eacb13 100644
--- a/source3/utils/net_usershare.c
+++ b/source3/utils/net_usershare.c
@@ -974,6 +974,7 @@ static int net_usershare_list(struct net_context *c, int
argc,
pi.ctx = ctx;
pi.op = US_LIST_OP;
+ pi.c = c;
ret = process_share_list(info_fn, pi);
talloc_destroy(ctx);
diff --git a/source3/winbindd/winbindd_dual.c b/source3/winbindd/winbindd_dual.c
index 92f0d60..ab07c97 100644
--- a/source3/winbindd/winbindd_dual.c
+++ b/source3/winbindd/winbindd_dual.c
@@ -179,10 +179,6 @@ int wb_child_request_recv(struct tevent_req *req,
TALLOC_CTX *mem_ctx,
if (tevent_req_is_unix_error(req, err)) {
return -1;
}
- if (state-response-result != WINBINDD_OK) {
- *err = EIO; /* EIO doesn't fit, but what would be better? */
- return -1;
- }
*presponse = talloc_move(mem_ctx, state-response);
return 0;
}
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha8-473-gb180fe3
The branch, master has been updated
via b180fe34a71a595d0dea8e72877149361b531e02 (commit)
from e7daa0d7049933e5a743f7e6db886f624490c53d (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit b180fe34a71a595d0dea8e72877149361b531e02
Author: Bo Yang boy...@samba.org
Date: Sat Jul 18 10:46:11 2009 +0800
s3: compile warning and upn handling
Signed-off-by: Bo Yang boy...@samba.org
---
Summary of changes:
nsswitch/pam_winbind.c | 37 -
source3/winbindd/winbindd_sid.c |5 +
source3/winbindd/winbindd_util.c |3 ++-
3 files changed, 31 insertions(+), 14 deletions(-)
Changeset truncated at 500 lines:
diff --git a/nsswitch/pam_winbind.c b/nsswitch/pam_winbind.c
index e90f1b7..f692316 100644
--- a/nsswitch/pam_winbind.c
+++ b/nsswitch/pam_winbind.c
@@ -11,6 +11,8 @@
*/
#include pam_winbind.h
+#define CONST_DISCARD(type,ptr) ((type)(void *)ptr)
+
static int wbc_error_to_pam_error(wbcErr status)
{
@@ -410,49 +412,51 @@ static int _pam_parse(const pam_handle_t *pamh,
config_file = PAM_WINBIND_CONFIG_FILE;
}
- d = iniparser_load(config_file);
+ d = iniparser_load(CONST_DISCARD(char *, config_file));
if (d == NULL) {
goto config_from_pam;
}
- if (iniparser_getboolean(d, global:debug, false)) {
+ if (iniparser_getboolean(d, CONST_DISCARD(char *, global:debug),
false)) {
ctrl |= WINBIND_DEBUG_ARG;
}
- if (iniparser_getboolean(d, global:debug_state, false)) {
+ if (iniparser_getboolean(d, CONST_DISCARD(char *,
global:debug_state), false)) {
ctrl |= WINBIND_DEBUG_STATE;
}
- if (iniparser_getboolean(d, global:cached_login, false)) {
+ if (iniparser_getboolean(d, CONST_DISCARD(char *,
global:cached_login), false)) {
ctrl |= WINBIND_CACHED_LOGIN;
}
- if (iniparser_getboolean(d, global:krb5_auth, false)) {
+ if (iniparser_getboolean(d, CONST_DISCARD(char *, global:krb5_auth),
false)) {
ctrl |= WINBIND_KRB5_AUTH;
}
- if (iniparser_getboolean(d, global:silent, false)) {
+ if (iniparser_getboolean(d, CONST_DISCARD(char *, global:silent),
false)) {
ctrl |= WINBIND_SILENT;
}
- if (iniparser_getstr(d, global:krb5_ccache_type) != NULL) {
+ if (iniparser_getstr(d, CONST_DISCARD(char *,
global:krb5_ccache_type)) != NULL) {
ctrl |= WINBIND_KRB5_CCACHE_TYPE;
}
- if ((iniparser_getstr(d, global:require-membership-of) != NULL) ||
- (iniparser_getstr(d, global:require_membership_of) != NULL)) {
+ if ((iniparser_getstr(d, CONST_DISCARD(char *,
global:require-membership-of))
+!= NULL) ||
+ (iniparser_getstr(d, CONST_DISCARD(char *,
global:require_membership_of))
+!= NULL)) {
ctrl |= WINBIND_REQUIRED_MEMBERSHIP;
}
- if (iniparser_getboolean(d, global:try_first_pass, false)) {
+ if (iniparser_getboolean(d, CONST_DISCARD(char *,
global:try_first_pass), false)) {
ctrl |= WINBIND_TRY_FIRST_PASS_ARG;
}
- if (iniparser_getint(d, global:warn_pwd_expire, 0)) {
+ if (iniparser_getint(d, CONST_DISCARD(char *,
global:warn_pwd_expire), 0)) {
ctrl |= WINBIND_WARN_PWD_EXPIRE;
}
- if (iniparser_getboolean(d, global:mkhomedir, false)) {
+ if (iniparser_getboolean(d, CONST_DISCARD(char *, global:mkhomedir),
false)) {
ctrl |= WINBIND_MKHOMEDIR;
}
@@ -2284,6 +2288,7 @@ static char* winbind_upn_to_username(struct pwb_context
*ctx,
enum wbcSidType type;
char *domain;
char *name;
+ char *p;
/* This cannot work when the winbind separator = @ */
@@ -2292,9 +2297,15 @@ static char* winbind_upn_to_username(struct pwb_context
*ctx,
return NULL;
}
+ name = talloc_strdup(ctx, upn);
+ if ((p = strchr(name, '@')) != NULL) {
+ *p = 0;
+ domain = talloc_strdup(ctx, p + 1);
+ }
+
/* Convert the UPN to a SID */
- wbc_status = wbcLookupName(, upn, sid, type);
+ wbc_status = wbcLookupName(domain, name, sid, type);
if (!WBC_ERROR_IS_OK(wbc_status)) {
return NULL;
}
diff --git a/source3/winbindd/winbindd_sid.c b/source3/winbindd/winbindd_sid.c
index c091cd7..f8cf7db 100644
--- a/source3/winbindd/winbindd_sid.c
+++ b/source3/winbindd/winbindd_sid.c
@@ -93,6 +93,11 @@ void winbindd_lookupname(struct winbindd_cli_state *state)
*p = 0;
name_domain = state-request-data.name.name;
name_user = p+1;
+ } else
[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha8-488-gf394fa7
The branch, master has been updated
via f394fa7766d394f30d35da4191a9ec7b09693a9c (commit)
from ffbcf3b491293db92141f7936e3fefc81066e730 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit f394fa7766d394f30d35da4191a9ec7b09693a9c
Author: Bo Yang boy...@samba.org
Date: Sat Jul 18 14:07:33 2009 +0800
s3: add failure check.
Signed-off-by: Bo Yang boy...@samba.org
---
Summary of changes:
nsswitch/pam_winbind.c |5 -
1 files changed, 4 insertions(+), 1 deletions(-)
Changeset truncated at 500 lines:
diff --git a/nsswitch/pam_winbind.c b/nsswitch/pam_winbind.c
index f692316..4e84574 100644
--- a/nsswitch/pam_winbind.c
+++ b/nsswitch/pam_winbind.c
@@ -2298,9 +2298,12 @@ static char* winbind_upn_to_username(struct pwb_context
*ctx,
}
name = talloc_strdup(ctx, upn);
+ if (!name) {
+ return NULL;
+ }
if ((p = strchr(name, '@')) != NULL) {
*p = 0;
- domain = talloc_strdup(ctx, p + 1);
+ domain = p + 1;
}
/* Convert the UPN to a SID */
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha8-337-g73e9693
The branch, master has been updated
via 73e96935c3604d21552ba93dfd561eaf7606f52d (commit)
via 2821f5abf5d60cf420877e92db5c615c83471e95 (commit)
via 86865365ce487a8943370ea2f313000a6440ea9a (commit)
via 9ef6af73b319048fc6f3891573f0e10066dffee6 (commit)
from 99c7ee3c9145b6187113ff29500b55a32320a9bc (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 73e96935c3604d21552ba93dfd561eaf7606f52d
Author: Bo Yang boy...@samba.org
Date: Wed Jul 15 17:03:04 2009 +0800
s3: fix build of pdbedit and net_sam. Guenther, please check.
Signed-off-by: Bo Yang boy...@samba.org
commit 2821f5abf5d60cf420877e92db5c615c83471e95
Author: Bo Yang boy...@samba.org
Date: Wed Jul 15 15:37:04 2009 +0800
s3: Fix double free in net usershare.
Signed-off-by: Bo Yang boy...@samba.org
commit 86865365ce487a8943370ea2f313000a6440ea9a
Author: Bo Yang boy...@samba.org
Date: Wed Jul 15 15:36:02 2009 +0800
S3: Small fix to get rid of annoying log message.
Signed-off-by: Bo Yang boy...@samba.org
commit 9ef6af73b319048fc6f3891573f0e10066dffee6
Author: Bo Yang boy...@samba.org
Date: Wed Jul 15 15:34:10 2009 +0800
s3: Make smbd aware of permission change of usershare. Since usershare are
relatively volatile and non-previledge users must disconnect from smbd and
reconnect to it to make share permission in effect.
---
Summary of changes:
source3/include/proto.h|7 ++-
source3/include/smb.h |6 ++
source3/param/loadparm.c | 14 +
source3/rpc_server/srv_srvsvc_nt.c |6 ++-
source3/smbd/conn.c|1 +
source3/smbd/notify_inotify.c |4 +-
source3/smbd/process.c | 58 +-
source3/smbd/service.c | 80 ++
source3/smbd/uid.c | 96 +++-
source3/utils/net_sam.c|8 ++--
source3/utils/net_usershare.c | 32 ++--
source3/utils/pdbedit.c|2 +-
12 files changed, 251 insertions(+), 63 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/include/proto.h b/source3/include/proto.h
index 0dd1e98..d141de4 100644
--- a/source3/include/proto.h
+++ b/source3/include/proto.h
@@ -4296,6 +4296,7 @@ enum usershare_err parse_usershare_file(TALLOC_CTX *ctx,
char **pp_comment,
SEC_DESC **ppsd,
bool *pallow_guest);
+bool am_usershare(int iService);
int load_usershare_service(const char *servicename);
int load_usershare_shares(void);
void gfree_loadparm(void);
@@ -7063,7 +7064,8 @@ void reply_transs2(struct smb_request *req);
bool change_to_guest(void);
void conn_clear_vuid_cache(connection_struct *conn, uint16_t vuid);
-bool change_to_user(connection_struct *conn, uint16 vuid);
+bool change_to_user_force_recheck(connection_struct *conn, uint16 vuid,
+ bool recheck, NTSTATUS *pstatus);
bool change_to_root_user(void);
bool become_authenticated_pipe_user(pipes_struct *p);
bool unbecome_authenticated_pipe_user(void);
@@ -7072,6 +7074,9 @@ void unbecome_root(void);
bool become_user(connection_struct *conn, uint16 vuid);
bool unbecome_user(void);
+#define change_to_user(conn, vuid) \
+ change_to_user_force_recheck(conn, vuid, 0, NULL)
+
/* The following definitions come from smbd/utmp.c */
void sys_utmp_claim(const char *username, const char *hostname,
diff --git a/source3/include/smb.h b/source3/include/smb.h
index 2e9cf1b..44216f8 100644
--- a/source3/include/smb.h
+++ b/source3/include/smb.h
@@ -550,6 +550,7 @@ typedef struct connection_struct {
unsigned cnum; /* an index passed over the wire */
struct share_params *params;
bool force_user;
+ bool force_recheck_perm;
struct vuid_cache vuid_cache;
struct dptr_struct *dirptr;
bool printer;
@@ -1398,6 +1399,11 @@ struct bitmap {
#define FILE_NOTIFY_CHANGE_STREAM_NAME 0x0200
#define FILE_NOTIFY_CHANGE_STREAM_SIZE 0x0400
#define FILE_NOTIFY_CHANGE_STREAM_WRITE0x0800
+#define FILE_NOTIFY_CHANGE_FILE_CONTENT \
+ (FILE_NOTIFY_CHANGE_FILE_NAME | FILE_NOTIFY_CHANGE_DIR_NAME \
+ | FILE_NOTIFY_CHANGE_ATTRIBUTES | FILE_NOTIFY_CHANGE_SIZE \
+ | FILE_NOTIFY_CHANGE_CREATION | FILE_NOTIFY_CHANGE_EA \
+ | FILE_NOTIFY_CHANGE_SECURITY)
#define FILE_NOTIFY_CHANGE_NAME \
(FILE_NOTIFY_CHANGE_FILE_NAME|FILE_NOTIFY_CHANGE_DIR_NAME)
diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c
index 7e4371b..4415804 100644
--- a/source3/param/loadparm.c
+++ b/source3/param/loadparm.c
@@ -5142,6 +5142,9 @@ static char *lp_string(const char *s)
#if 0
DEBUG(10, (lp_string(%s)\n, s));
#endif
[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha7-1735-gcbe3dab
The branch, master has been updated
via cbe3dabb9d1fe4e16e14c50550df2afab7e4a21e (commit)
via 8c7a579bdcca32897bd9ee716a488568b721ed90 (commit)
via e65aa34078f5c2c969103a23d6693071d88672a2 (commit)
from 000da55dd930d151db14ee8eed58e82806522692 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit cbe3dabb9d1fe4e16e14c50550df2afab7e4a21e
Author: Bo Yang boy...@samba.org
Date: Fri May 22 02:12:59 2009 +0800
s3: Fix onlinestatus msg to return status of all domain instead of omitting
trusted domains
Signed-off-by: Bo Yang boy...@samba.org
commit 8c7a579bdcca32897bd9ee716a488568b721ed90
Author: Bo Yang boy...@samba.org
Date: Fri May 22 02:03:32 2009 +0800
s3: set winbindd request flags in ntlm_auth to make it contact trusted
domain when krb5 auth is enabled
Signed-off-by: Bo Yang boy...@samba.org
commit e65aa34078f5c2c969103a23d6693071d88672a2
Author: Bo Yang boy...@samba.org
Date: Fri May 22 01:39:03 2009 +0800
s3: Fix request flags in wbinfo when perform krb5 authentication
Signed-off-by: Bo Yang boy...@samba.org
---
Summary of changes:
nsswitch/wbinfo.c|3 +-
source3/Makefile.in |2 +-
source3/utils/ntlm_auth.c| 57 -
source3/utils/ntlm_auth_proto.h |1 +
source3/winbindd/winbindd_dual.c | 129 +++---
5 files changed, 111 insertions(+), 81 deletions(-)
Changeset truncated at 500 lines:
diff --git a/nsswitch/wbinfo.c b/nsswitch/wbinfo.c
index 9ee0e01..04addda 100644
--- a/nsswitch/wbinfo.c
+++ b/nsswitch/wbinfo.c
@@ -2031,7 +2031,8 @@ int main(int argc, char **argv, char **envp)
uint32 flags = WBFLAG_PAM_KRB5 |
WBFLAG_PAM_CACHED_LOGIN |
WBFLAG_PAM_FALLBACK_AFTER_KRB5 |
- WBFLAG_PAM_INFO3_TEXT;
+ WBFLAG_PAM_INFO3_TEXT |
+ WBFLAG_PAM_CONTACT_TRUSTDOM;
if (!wbinfo_auth_krb5(string_arg, FILE,
flags)) {
d_fprintf(stderr, Could not
authenticate user [%s] with
diff --git a/source3/Makefile.in b/source3/Makefile.in
index fdcd86a..585bd5d 100644
--- a/source3/Makefile.in
+++ b/source3/Makefile.in
@@ -2813,7 +2813,7 @@ bin/ntlm_a...@exeext@: $(BINARY_PREREQS) $(NTLM_AUTH_OBJ)
$(PARAM_OBJ) \
@$(CC) -o $@ $(LDFLAGS) $(DYNEXP) $(NTLM_AUTH_OBJ) \
$(PARAM_OBJ) $(LIB_NONSMBD_OBJ) $(LIBS) \
$(POPT_LIBS) $(KRB5LIBS) $(LDAP_LIBS) $(NSCD_LIBS) \
- $(LIBTALLOC_LIBS) $(LIBTDB_LIBS) $(LIBWBCLIENT_LIBS)
+ $(LIBTALLOC_LIBS) $(LIBTDB_LIBS) $(LIBWBCLIENT_LIBS)
@INIPARSERLIBS@
bin/pam_smbpa...@shlibext@: $(BINARY_PREREQS) $(PAM_SMBPASS_OBJ)
@LIBTALLOC_TARGET@ @LIBWBCLIENT_TARGET@ @LIBTDB_TARGET@
@echo Linking shared library $@
diff --git a/source3/utils/ntlm_auth.c b/source3/utils/ntlm_auth.c
index 50688bf..6de5ea6 100644
--- a/source3/utils/ntlm_auth.c
+++ b/source3/utils/ntlm_auth.c
@@ -26,6 +26,13 @@
#include includes.h
#include utils/ntlm_auth.h
#include ../libcli/auth/libcli_auth.h
+#include iniparser.h
+
+#ifndef PAM_WINBIND_CONFIG_FILE
+#define PAM_WINBIND_CONFIG_FILE /etc/security/pam_winbind.conf
+#endif
+
+#define WINBIND_KRB5_AUTH 0x0080
#undef DBGC_CLASS
#define DBGC_CLASS DBGC_WINBIND
@@ -125,6 +132,7 @@ static int use_cached_creds;
static const char *require_membership_of;
static const char *require_membership_of_sid;
+static const char *opt_pam_winbind_conf;
static char winbind_separator(void)
{
@@ -279,6 +287,36 @@ static bool get_require_membership_sid(void) {
return False;
}
+
+/*
+ * Get some configuration from pam_winbind.conf to see if we
+ * need to contact trusted domain
+ */
+
+int get_pam_winbind_config()
+{
+ int ctrl = 0;
+ dictionary *d = NULL;
+
+ if (!opt_pam_winbind_conf || !*opt_pam_winbind_conf) {
+ opt_pam_winbind_conf = PAM_WINBIND_CONFIG_FILE;
+ }
+
+ d = iniparser_load(CONST_DISCARD(char *, opt_pam_winbind_conf));
+
+ if (!d) {
+ return 0;
+ }
+
+ if (iniparser_getboolean(d, CONST_DISCARD(char *, global:krb5_auth),
false)) {
+ ctrl |= WINBIND_KRB5_AUTH;
+ }
+
+ iniparser_freedict(d);
+
+ return ctrl;
+}
+
/* Authenticate a user with a plaintext password */
static bool check_plaintext_auth(const char *user, const char *pass,
@@ -677,12 +715,27 @@ static NTSTATUS do_ccache_ntlm_auth(DATA_BLOB
initial_msg, DATA_BLOB challenge_m
{
struct winbindd_request
[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha7-1736-gd7480a9
The branch, master has been updated
via d7480a91b4331a5c98517338f2c258bf270926a3 (commit)
from cbe3dabb9d1fe4e16e14c50550df2afab7e4a21e (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit d7480a91b4331a5c98517338f2c258bf270926a3
Author: Bo Yang boy...@samba.org
Date: Fri May 22 03:22:52 2009 +0800
s3: ignore EPIPE error when winbind finally writes to wb client because
client might have already closed the socket
Signed-off-by: Bo Yang boy...@samba.org
---
Summary of changes:
source3/winbindd/winbindd.c | 10 --
1 files changed, 8 insertions(+), 2 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/winbindd/winbindd.c b/source3/winbindd/winbindd.c
index fb7eda9..52517b0 100644
--- a/source3/winbindd/winbindd.c
+++ b/source3/winbindd/winbindd.c
@@ -866,8 +866,14 @@ static void remove_client(struct winbindd_cli_state *state)
/* tell client, we are closing ... */
nwritten = write(state-sock, c, sizeof(c));
if (nwritten == -1) {
- DEBUG(2, (final write to client failed: %s\n,
- strerror(errno)));
+ /*
+* ignore EPIPE error here, because the other end might
+* have already closed the socket.
+*/
+ if (errno != EPIPE) {
+ DEBUG(2, (final write to client failed: %s\n,
+ strerror(errno)));
+ }
}
/* Close socket */
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha7-1669-gaa70e44
The branch, master has been updated
via aa70e44cd0576e5280e24cf35000369a47dd958f (commit)
from 2722dd357cedcd3fad1e3739a4a64f924d53eccb (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit aa70e44cd0576e5280e24cf35000369a47dd958f
Author: Bo Yang boy...@samba.org
Date: Tue May 19 01:13:36 2009 +0800
s3: tevent_req_poll() loops forever when pipe is broken
Signed-off-by: Bo Yang boy...@samba.org
---
Summary of changes:
source3/libsmb/async_smb.c |8
source3/rpc_client/rpc_transport_sock.c | 21 -
2 files changed, 28 insertions(+), 1 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/libsmb/async_smb.c b/source3/libsmb/async_smb.c
index 7afba0d..96b7054 100644
--- a/source3/libsmb/async_smb.c
+++ b/source3/libsmb/async_smb.c
@@ -742,6 +742,10 @@ static void cli_smb_sent(struct tevent_req *subreq)
nwritten = writev_recv(subreq, err);
TALLOC_FREE(subreq);
if (nwritten == -1) {
+ if (err == EPIPE) {
+ close(state-cli-fd);
+ state-cli-fd = -1;
+ }
tevent_req_nterror(req, map_nt_error_from_unix(err));
return;
}
@@ -787,6 +791,10 @@ static void cli_smb_received(struct tevent_req *subreq)
received = read_smb_recv(subreq, talloc_tos(), inbuf, err);
TALLOC_FREE(subreq);
if (received == -1) {
+ if (err == EPIPE) {
+ close(cli-fd);
+ cli-fd = -1;
+ }
status = map_nt_error_from_unix(err);
goto fail;
}
diff --git a/source3/rpc_client/rpc_transport_sock.c
b/source3/rpc_client/rpc_transport_sock.c
index 570d792..3756f73 100644
--- a/source3/rpc_client/rpc_transport_sock.c
+++ b/source3/rpc_client/rpc_transport_sock.c
@@ -36,6 +36,7 @@ static int rpc_transport_sock_state_destructor(struct
rpc_transport_sock_state *
}
struct rpc_sock_read_state {
+ struct rpc_transport_sock_state *transp;
ssize_t received;
};
@@ -55,7 +56,11 @@ static struct tevent_req *rpc_sock_read_send(TALLOC_CTX
*mem_ctx,
if (req == NULL) {
return NULL;
}
-
+ if (sock_transp-fd == -1) {
+ tevent_req_nterror(req, NT_STATUS_CONNECTION_INVALID);
+ return tevent_req_post(req, ev);
+ }
+ state-transp = sock_transp;
subreq = async_recv_send(state, ev, sock_transp-fd, data, size, 0);
if (subreq == NULL) {
goto fail;
@@ -77,6 +82,10 @@ static void rpc_sock_read_done(struct tevent_req *subreq)
state-received = async_recv_recv(subreq, err);
if (state-received == -1) {
+ if (err == EPIPE) {
+ close(state-transp-fd);
+ state-transp-fd = -1;
+ }
tevent_req_nterror(req, map_nt_error_from_unix(err));
return;
}
@@ -97,6 +106,7 @@ static NTSTATUS rpc_sock_read_recv(struct tevent_req *req,
ssize_t *preceived)
}
struct rpc_sock_write_state {
+ struct rpc_transport_sock_state *transp;
ssize_t sent;
};
@@ -116,6 +126,11 @@ static struct tevent_req *rpc_sock_write_send(TALLOC_CTX
*mem_ctx,
if (req == NULL) {
return NULL;
}
+ if (sock_transp-fd == -1) {
+ tevent_req_nterror(req, NT_STATUS_CONNECTION_INVALID);
+ return tevent_req_post(req, ev);
+ }
+ state-transp = sock_transp;
subreq = async_send_send(state, ev, sock_transp-fd, data, size, 0);
if (subreq == NULL) {
goto fail;
@@ -137,6 +152,10 @@ static void rpc_sock_write_done(struct tevent_req *subreq)
state-sent = async_send_recv(subreq, err);
if (state-sent == -1) {
+ if (err == EPIPE) {
+ close(state-transp-fd);
+ state-transp-fd = -1;
+ }
tevent_req_nterror(req, map_nt_error_from_unix(err));
return;
}
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha7-1589-g05379f0
The branch, master has been updated
via 05379f01252fc8b449f36130bcf00c321d7a1c37 (commit)
from 42e0cb8c0a1b8470ac8e9ad1c5a741e299debb8f (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 05379f01252fc8b449f36130bcf00c321d7a1c37
Author: Bo Yang boy...@samba.org
Date: Thu May 14 10:13:12 2009 +0800
s3: return proper error code in cli_smb_req_send
Signed-off-by: Bo Yang boy...@samba.org
---
Summary of changes:
source3/include/async_smb.h |2 +-
source3/libsmb/async_smb.c| 50 +++--
source3/libsmb/cliconnect.c | 19 ---
source3/libsmb/clifile.c | 20 +---
source3/libsmb/clireadwrite.c | 20 +---
source3/libsmb/clitrans.c | 11 +---
6 files changed, 83 insertions(+), 39 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/include/async_smb.h b/source3/include/async_smb.h
index 87ddca6..c27dd2b 100644
--- a/source3/include/async_smb.h
+++ b/source3/include/async_smb.h
@@ -47,7 +47,7 @@ struct tevent_req *cli_smb_req_create(TALLOC_CTX *mem_ctx,
uint8_t wct, uint16_t *vwv,
int iov_count,
struct iovec *bytes_iov);
-bool cli_smb_req_send(struct tevent_req *req);
+NTSTATUS cli_smb_req_send(struct tevent_req *req);
size_t cli_smb_wct_ofs(struct tevent_req **reqs, int num_reqs);
bool cli_smb_chain_send(struct tevent_req **reqs, int num_reqs);
uint8_t *cli_smb_inbuf(struct tevent_req *req);
diff --git a/source3/libsmb/async_smb.c b/source3/libsmb/async_smb.c
index 9fdd147..0d82894 100644
--- a/source3/libsmb/async_smb.c
+++ b/source3/libsmb/async_smb.c
@@ -512,8 +512,8 @@ struct tevent_req *cli_smb_req_create(TALLOC_CTX *mem_ctx,
return result;
}
-static bool cli_signv(struct cli_state *cli, struct iovec *iov, int count,
- uint32_t *seqnum)
+static NTSTATUS cli_signv(struct cli_state *cli, struct iovec *iov, int count,
+ uint32_t *seqnum)
{
uint8_t *buf;
@@ -523,31 +523,32 @@ static bool cli_signv(struct cli_state *cli, struct iovec
*iov, int count,
*/
if ((count = 0) || (iov[0].iov_len smb_wct)) {
- return false;
+ return NT_STATUS_INVALID_PARAMETER;
}
buf = iov_concat(talloc_tos(), iov, count);
if (buf == NULL) {
- return false;
+ return NT_STATUS_NO_MEMORY;
}
cli_calculate_sign_mac(cli, (char *)buf, seqnum);
memcpy(iov[0].iov_base, buf, iov[0].iov_len);
TALLOC_FREE(buf);
- return true;
+ return NT_STATUS_OK;
}
static void cli_smb_sent(struct tevent_req *subreq);
-static bool cli_smb_req_iov_send(struct tevent_req *req,
-struct cli_smb_state *state,
-struct iovec *iov, int iov_count)
+static NTSTATUS cli_smb_req_iov_send(struct tevent_req *req,
+struct cli_smb_state *state,
+struct iovec *iov, int iov_count)
{
struct tevent_req *subreq;
+ NTSTATUS status;
if (iov[0].iov_len smb_wct) {
- return false;
+ return NT_STATUS_INVALID_PARAMETER;
}
if (state-mid != 0) {
@@ -558,17 +559,18 @@ static bool cli_smb_req_iov_send(struct tevent_req *req,
smb_setlen((char *)iov[0].iov_base, iov_len(iov, iov_count) - 4);
- if (!cli_signv(state-cli, iov, iov_count, state-seqnum)) {
- return false;
+ status = cli_signv(state-cli, iov, iov_count, state-seqnum);
+
+ if (!NT_STATUS_IS_OK(status)) {
+ return status;
}
if (cli_encryption_on(state-cli)) {
- NTSTATUS status;
char *buf, *enc_buf;
buf = (char *)iov_concat(talloc_tos(), iov, iov_count);
if (buf == NULL) {
- return false;
+ return NT_STATUS_NO_MEMORY;
}
status = cli_encrypt_message(state-cli, (char *)buf,
enc_buf);
@@ -576,13 +578,13 @@ static bool cli_smb_req_iov_send(struct tevent_req *req,
if (!NT_STATUS_IS_OK(status)) {
DEBUG(0, (Error in encrypting client message: %s\n,
nt_errstr(status)));
- return false;
+ return status;
}
buf = (char *)talloc_memdup(state, enc_buf,
smb_len(enc_buf)+4);
SAFE_FREE(enc_buf);
if (buf == NULL
[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha7-1590-g8611f03
The branch, master has been updated via 8611f03dbb0c45d8755725232508cff258b426d5 (commit) from 05379f01252fc8b449f36130bcf00c321d7a1c37 (commit) http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit 8611f03dbb0c45d8755725232508cff258b426d5 Author: Bo Yang boy...@samba.org Date: Wed May 13 18:59:55 2009 +0800 s3: checkin .po for pam_winbind Signed-off-by: Bo Yang boy...@samba.org --- Summary of changes: source3/locale/pam_winbind/ar.po| 153 + source3/locale/pam_winbind/cs.po| 153 + source3/locale/pam_winbind/da.po| 178 + source3/locale/pam_winbind/es.po| 153 + source3/locale/pam_winbind/fi.po| 181 ++ source3/locale/pam_winbind/fr.po| 153 + source3/locale/pam_winbind/hu.po| 166 +++ source3/locale/pam_winbind/it.po| 153 + source3/locale/pam_winbind/ja.po| 153 + source3/locale/pam_winbind/ko.po| 153 + source3/locale/pam_winbind/nb.po| 184 +++ source3/locale/pam_winbind/nl.po| 153 + source3/locale/pam_winbind/pl.po| 153 + source3/locale/pam_winbind/pt_BR.po | 153 + source3/locale/pam_winbind/ru.po| 153 + source3/locale/pam_winbind/sv.po| 153 + source3/locale/pam_winbind/zh_CN.po | 153 + source3/locale/pam_winbind/zh_TW.po | 153 + 18 files changed, 2851 insertions(+), 0 deletions(-) create mode 100644 source3/locale/pam_winbind/ar.po create mode 100644 source3/locale/pam_winbind/cs.po create mode 100644 source3/locale/pam_winbind/da.po create mode 100644 source3/locale/pam_winbind/es.po create mode 100644 source3/locale/pam_winbind/fi.po create mode 100644 source3/locale/pam_winbind/fr.po create mode 100644 source3/locale/pam_winbind/hu.po create mode 100644 source3/locale/pam_winbind/it.po create mode 100644 source3/locale/pam_winbind/ja.po create mode 100644 source3/locale/pam_winbind/ko.po create mode 100644 source3/locale/pam_winbind/nb.po create mode 100644 source3/locale/pam_winbind/nl.po create mode 100644 source3/locale/pam_winbind/pl.po create mode 100644 source3/locale/pam_winbind/pt_BR.po create mode 100644 source3/locale/pam_winbind/ru.po create mode 100644 source3/locale/pam_winbind/sv.po create mode 100644 source3/locale/pam_winbind/zh_CN.po create mode 100644 source3/locale/pam_winbind/zh_TW.po Changeset truncated at 500 lines: diff --git a/source3/locale/pam_winbind/ar.po b/source3/locale/pam_winbind/ar.po new file mode 100644 index 000..c7309b2 --- /dev/null +++ b/source3/locale/pam_winbind/ar.po @@ -0,0 +1,153 @@ +# Copyright (C) 2006 SuSE Linux Products GmbH, Nuernberg +# This file is distributed under the same license as the package. +# +msgid +msgstr +Project-Id-Version: pam_winbind\n +Report-Msgid-Bugs-To: \n +POT-Creation-Date: 2008-07-16 15:30+0800\n +PO-Revision-Date: 2009-02-06 08:04\n +Last-Translator: Novell Language langu...@novell.com\n +Language-Team: Novell Language langu...@novell.com\n +MIME-Version: 1.0\n +Content-Type: text/plain; charset=UTF-8\n +Content-Transfer-Encoding: 8bit\n + +#: pam_winbind.c:326 +msgid Success +msgstr ÙØ¬Ø§Ø + +#: pam_winbind.c:327 +msgid No primary Domain Controler available +msgstr جÙاز اÙتØÙÙ Ù٠اÙ٠جا٠اÙرئÙس٠غÙر ٠تÙÙر + +#: pam_winbind.c:328 +msgid No domain controllers found +msgstr ÙÙ Ùت٠اÙعثÙر عÙ٠أجÙزة تØÙÙ Ù٠اÙ٠جا٠+ +#: pam_winbind.c:329 +msgid No logon servers +msgstr Ùا تÙجد Ø®Ùاد٠تسجÙ٠اÙدخÙÙ + +#: pam_winbind.c:330 +msgid Password too short +msgstr ÙÙÙ Ø© اÙسر ÙصÙرة جدÙا + +#: pam_winbind.c:331 +msgid The password of this user is too recent to change +msgstr ÙÙÙ Ø© سر Ùذا اÙ٠ستخد٠ØدÙثة جدÙا عÙ٠اÙتغÙÙر + +#: pam_winbind.c:332 +msgid Password is already in password history +msgstr ÙÙÙ Ø© اÙسر Ù ÙجÙدة باÙÙع٠Ù٠سج٠ÙÙ٠ات اÙسر + +#: pam_winbind.c:333 +msgid Your password has expired +msgstr اÙتÙت صÙاØÙØ© ÙÙÙ Ø© اÙسر اÙخاصة ب٠+ +#: pam_winbind.c:334 +msgid You need to change your password now +msgstr ÙÙز٠تغÙÙر ÙÙÙ Ø© اÙسر اÙØ¢Ù + +#: pam_winbind.c:335 +msgid You are not allowed to logon from this workstation +msgstr غÙر ٠س٠ÙØ Ù٠بتسجÙ٠اÙدخÙÙ Ù Ù Ù Øطة اÙع٠٠ÙØ°Ù + +#: pam_winbind.c
[SCM] Samba Shared Repository - branch v3-4-test updated - release-4-0-0alpha7-975-g4338852
The branch, v3-4-test has been updated via 43388521b8f31757309fb8bec71ad9ee0f3b21de (commit) from de68d52c8b7b101ad37d3eb09456bcb31e687906 (commit) http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-4-test - Log - commit 43388521b8f31757309fb8bec71ad9ee0f3b21de Author: Bo Yang boy...@samba.org Date: Wed May 13 18:59:55 2009 +0800 s3: checkin .po for pam_winbind Signed-off-by: Bo Yang boy...@samba.org (cherry picked from commit 8611f03dbb0c45d8755725232508cff258b426d5) --- Summary of changes: source3/locale/pam_winbind/ar.po| 153 + source3/locale/pam_winbind/cs.po| 153 + source3/locale/pam_winbind/da.po| 178 + source3/locale/pam_winbind/es.po| 153 + source3/locale/pam_winbind/fi.po| 181 ++ source3/locale/pam_winbind/fr.po| 153 + source3/locale/pam_winbind/hu.po| 166 +++ source3/locale/pam_winbind/it.po| 153 + source3/locale/pam_winbind/ja.po| 153 + source3/locale/pam_winbind/ko.po| 153 + source3/locale/pam_winbind/nb.po| 184 +++ source3/locale/pam_winbind/nl.po| 153 + source3/locale/pam_winbind/pl.po| 153 + source3/locale/pam_winbind/pt_BR.po | 153 + source3/locale/pam_winbind/ru.po| 153 + source3/locale/pam_winbind/sv.po| 153 + source3/locale/pam_winbind/zh_CN.po | 153 + source3/locale/pam_winbind/zh_TW.po | 153 + 18 files changed, 2851 insertions(+), 0 deletions(-) create mode 100644 source3/locale/pam_winbind/ar.po create mode 100644 source3/locale/pam_winbind/cs.po create mode 100644 source3/locale/pam_winbind/da.po create mode 100644 source3/locale/pam_winbind/es.po create mode 100644 source3/locale/pam_winbind/fi.po create mode 100644 source3/locale/pam_winbind/fr.po create mode 100644 source3/locale/pam_winbind/hu.po create mode 100644 source3/locale/pam_winbind/it.po create mode 100644 source3/locale/pam_winbind/ja.po create mode 100644 source3/locale/pam_winbind/ko.po create mode 100644 source3/locale/pam_winbind/nb.po create mode 100644 source3/locale/pam_winbind/nl.po create mode 100644 source3/locale/pam_winbind/pl.po create mode 100644 source3/locale/pam_winbind/pt_BR.po create mode 100644 source3/locale/pam_winbind/ru.po create mode 100644 source3/locale/pam_winbind/sv.po create mode 100644 source3/locale/pam_winbind/zh_CN.po create mode 100644 source3/locale/pam_winbind/zh_TW.po Changeset truncated at 500 lines: diff --git a/source3/locale/pam_winbind/ar.po b/source3/locale/pam_winbind/ar.po new file mode 100644 index 000..c7309b2 --- /dev/null +++ b/source3/locale/pam_winbind/ar.po @@ -0,0 +1,153 @@ +# Copyright (C) 2006 SuSE Linux Products GmbH, Nuernberg +# This file is distributed under the same license as the package. +# +msgid +msgstr +Project-Id-Version: pam_winbind\n +Report-Msgid-Bugs-To: \n +POT-Creation-Date: 2008-07-16 15:30+0800\n +PO-Revision-Date: 2009-02-06 08:04\n +Last-Translator: Novell Language langu...@novell.com\n +Language-Team: Novell Language langu...@novell.com\n +MIME-Version: 1.0\n +Content-Type: text/plain; charset=UTF-8\n +Content-Transfer-Encoding: 8bit\n + +#: pam_winbind.c:326 +msgid Success +msgstr ÙØ¬Ø§Ø + +#: pam_winbind.c:327 +msgid No primary Domain Controler available +msgstr جÙاز اÙتØÙÙ Ù٠اÙ٠جا٠اÙرئÙس٠غÙر ٠تÙÙر + +#: pam_winbind.c:328 +msgid No domain controllers found +msgstr ÙÙ Ùت٠اÙعثÙر عÙ٠أجÙزة تØÙÙ Ù٠اÙ٠جا٠+ +#: pam_winbind.c:329 +msgid No logon servers +msgstr Ùا تÙجد Ø®Ùاد٠تسجÙ٠اÙدخÙÙ + +#: pam_winbind.c:330 +msgid Password too short +msgstr ÙÙÙ Ø© اÙسر ÙصÙرة جدÙا + +#: pam_winbind.c:331 +msgid The password of this user is too recent to change +msgstr ÙÙÙ Ø© سر Ùذا اÙ٠ستخد٠ØدÙثة جدÙا عÙ٠اÙتغÙÙر + +#: pam_winbind.c:332 +msgid Password is already in password history +msgstr ÙÙÙ Ø© اÙسر Ù ÙجÙدة باÙÙع٠Ù٠سج٠ÙÙ٠ات اÙسر + +#: pam_winbind.c:333 +msgid Your password has expired +msgstr اÙتÙت صÙاØÙØ© ÙÙÙ Ø© اÙسر اÙخاصة ب٠+ +#: pam_winbind.c:334 +msgid You need to change your password now +msgstr ÙÙز٠تغÙÙر ÙÙÙ Ø© اÙسر اÙØ¢Ù + +#: pam_winbind.c:335 +msgid You are not allowed to logon from this workstation +msgstr غÙر ٠س٠ÙØ ÙÙ
[SCM] Samba Shared Repository - branch v3-4-test updated - release-4-0-0alpha7-976-g0c54e8b
The branch, v3-4-test has been updated via 0c54e8b3e4f9d7efe1974fa39a039997196b6309 (commit) from 43388521b8f31757309fb8bec71ad9ee0f3b21de (commit) http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-4-test - Log - commit 0c54e8b3e4f9d7efe1974fa39a039997196b6309 Author: Bo Yang boy...@samba.org Date: Wed May 13 21:54:06 2009 +0800 Revert s3: checkin .po for pam_winbind because of license issue. This reverts commit 43388521b8f31757309fb8bec71ad9ee0f3b21de. --- Summary of changes: source3/locale/pam_winbind/ar.po| 153 - source3/locale/pam_winbind/cs.po| 153 - source3/locale/pam_winbind/da.po| 178 - source3/locale/pam_winbind/es.po| 153 - source3/locale/pam_winbind/fi.po| 181 -- source3/locale/pam_winbind/fr.po| 153 - source3/locale/pam_winbind/hu.po| 166 --- source3/locale/pam_winbind/it.po| 153 - source3/locale/pam_winbind/ja.po| 153 - source3/locale/pam_winbind/ko.po| 153 - source3/locale/pam_winbind/nb.po| 184 --- source3/locale/pam_winbind/nl.po| 153 - source3/locale/pam_winbind/pl.po| 153 - source3/locale/pam_winbind/pt_BR.po | 153 - source3/locale/pam_winbind/ru.po| 153 - source3/locale/pam_winbind/sv.po| 153 - source3/locale/pam_winbind/zh_CN.po | 153 - source3/locale/pam_winbind/zh_TW.po | 153 - 18 files changed, 0 insertions(+), 2851 deletions(-) delete mode 100644 source3/locale/pam_winbind/ar.po delete mode 100644 source3/locale/pam_winbind/cs.po delete mode 100644 source3/locale/pam_winbind/da.po delete mode 100644 source3/locale/pam_winbind/es.po delete mode 100644 source3/locale/pam_winbind/fi.po delete mode 100644 source3/locale/pam_winbind/fr.po delete mode 100644 source3/locale/pam_winbind/hu.po delete mode 100644 source3/locale/pam_winbind/it.po delete mode 100644 source3/locale/pam_winbind/ja.po delete mode 100644 source3/locale/pam_winbind/ko.po delete mode 100644 source3/locale/pam_winbind/nb.po delete mode 100644 source3/locale/pam_winbind/nl.po delete mode 100644 source3/locale/pam_winbind/pl.po delete mode 100644 source3/locale/pam_winbind/pt_BR.po delete mode 100644 source3/locale/pam_winbind/ru.po delete mode 100644 source3/locale/pam_winbind/sv.po delete mode 100644 source3/locale/pam_winbind/zh_CN.po delete mode 100644 source3/locale/pam_winbind/zh_TW.po Changeset truncated at 500 lines: diff --git a/source3/locale/pam_winbind/ar.po b/source3/locale/pam_winbind/ar.po deleted file mode 100644 index c7309b2..000 --- a/source3/locale/pam_winbind/ar.po +++ /dev/null @@ -1,153 +0,0 @@ -# Copyright (C) 2006 SuSE Linux Products GmbH, Nuernberg -# This file is distributed under the same license as the package. -# -msgid -msgstr -Project-Id-Version: pam_winbind\n -Report-Msgid-Bugs-To: \n -POT-Creation-Date: 2008-07-16 15:30+0800\n -PO-Revision-Date: 2009-02-06 08:04\n -Last-Translator: Novell Language langu...@novell.com\n -Language-Team: Novell Language langu...@novell.com\n -MIME-Version: 1.0\n -Content-Type: text/plain; charset=UTF-8\n -Content-Transfer-Encoding: 8bit\n - -#: pam_winbind.c:326 -msgid Success -msgstr ÙØ¬Ø§Ø - -#: pam_winbind.c:327 -msgid No primary Domain Controler available -msgstr جÙاز اÙتØÙÙ Ù٠اÙ٠جا٠اÙرئÙس٠غÙر ٠تÙÙر - -#: pam_winbind.c:328 -msgid No domain controllers found -msgstr ÙÙ Ùت٠اÙعثÙر عÙ٠أجÙزة تØÙÙ Ù٠اÙ٠جا٠- -#: pam_winbind.c:329 -msgid No logon servers -msgstr Ùا تÙجد Ø®Ùاد٠تسجÙ٠اÙدخÙÙ - -#: pam_winbind.c:330 -msgid Password too short -msgstr ÙÙÙ Ø© اÙسر ÙصÙرة جدÙا - -#: pam_winbind.c:331 -msgid The password of this user is too recent to change -msgstr ÙÙÙ Ø© سر Ùذا اÙ٠ستخد٠ØدÙثة جدÙا عÙ٠اÙتغÙÙر - -#: pam_winbind.c:332 -msgid Password is already in password history -msgstr ÙÙÙ Ø© اÙسر Ù ÙجÙدة باÙÙع٠Ù٠سج٠ÙÙ٠ات اÙسر - -#: pam_winbind.c:333 -msgid Your password has expired -msgstr اÙتÙت صÙاØÙØ© ÙÙÙ Ø© اÙسر اÙخاصة ب٠- -#: pam_winbind.c:334 -msgid You need to change your password now -msgstr ÙÙز٠تغÙÙر ÙÙÙ Ø© اÙسر اÙØ¢Ù - -#: pam_winbind.c:335 -msgid You are not allowed to logon from this workstation -msgstr غÙر ٠س٠ÙØ Ù٠بتسجÙÙ
[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha7-1598-g83ff460
The branch, master has been updated via 83ff460401dd3ebd4daed5cb5f611adf44e184da (commit) from e03b9ae609a3ef856c483832332e307975a1bf0a (commit) http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit 83ff460401dd3ebd4daed5cb5f611adf44e184da Author: Bo Yang boy...@samba.org Date: Wed May 13 22:00:05 2009 +0800 Revert s3: checkin .po for pam_winbind because of license issue. This reverts commit 8611f03dbb0c45d8755725232508cff258b426d5. --- Summary of changes: source3/locale/pam_winbind/ar.po| 153 - source3/locale/pam_winbind/cs.po| 153 - source3/locale/pam_winbind/da.po| 178 - source3/locale/pam_winbind/es.po| 153 - source3/locale/pam_winbind/fi.po| 181 -- source3/locale/pam_winbind/fr.po| 153 - source3/locale/pam_winbind/hu.po| 166 --- source3/locale/pam_winbind/it.po| 153 - source3/locale/pam_winbind/ja.po| 153 - source3/locale/pam_winbind/ko.po| 153 - source3/locale/pam_winbind/nb.po| 184 --- source3/locale/pam_winbind/nl.po| 153 - source3/locale/pam_winbind/pl.po| 153 - source3/locale/pam_winbind/pt_BR.po | 153 - source3/locale/pam_winbind/ru.po| 153 - source3/locale/pam_winbind/sv.po| 153 - source3/locale/pam_winbind/zh_CN.po | 153 - source3/locale/pam_winbind/zh_TW.po | 153 - 18 files changed, 0 insertions(+), 2851 deletions(-) delete mode 100644 source3/locale/pam_winbind/ar.po delete mode 100644 source3/locale/pam_winbind/cs.po delete mode 100644 source3/locale/pam_winbind/da.po delete mode 100644 source3/locale/pam_winbind/es.po delete mode 100644 source3/locale/pam_winbind/fi.po delete mode 100644 source3/locale/pam_winbind/fr.po delete mode 100644 source3/locale/pam_winbind/hu.po delete mode 100644 source3/locale/pam_winbind/it.po delete mode 100644 source3/locale/pam_winbind/ja.po delete mode 100644 source3/locale/pam_winbind/ko.po delete mode 100644 source3/locale/pam_winbind/nb.po delete mode 100644 source3/locale/pam_winbind/nl.po delete mode 100644 source3/locale/pam_winbind/pl.po delete mode 100644 source3/locale/pam_winbind/pt_BR.po delete mode 100644 source3/locale/pam_winbind/ru.po delete mode 100644 source3/locale/pam_winbind/sv.po delete mode 100644 source3/locale/pam_winbind/zh_CN.po delete mode 100644 source3/locale/pam_winbind/zh_TW.po Changeset truncated at 500 lines: diff --git a/source3/locale/pam_winbind/ar.po b/source3/locale/pam_winbind/ar.po deleted file mode 100644 index c7309b2..000 --- a/source3/locale/pam_winbind/ar.po +++ /dev/null @@ -1,153 +0,0 @@ -# Copyright (C) 2006 SuSE Linux Products GmbH, Nuernberg -# This file is distributed under the same license as the package. -# -msgid -msgstr -Project-Id-Version: pam_winbind\n -Report-Msgid-Bugs-To: \n -POT-Creation-Date: 2008-07-16 15:30+0800\n -PO-Revision-Date: 2009-02-06 08:04\n -Last-Translator: Novell Language langu...@novell.com\n -Language-Team: Novell Language langu...@novell.com\n -MIME-Version: 1.0\n -Content-Type: text/plain; charset=UTF-8\n -Content-Transfer-Encoding: 8bit\n - -#: pam_winbind.c:326 -msgid Success -msgstr ÙØ¬Ø§Ø - -#: pam_winbind.c:327 -msgid No primary Domain Controler available -msgstr جÙاز اÙتØÙÙ Ù٠اÙ٠جا٠اÙرئÙس٠غÙر ٠تÙÙر - -#: pam_winbind.c:328 -msgid No domain controllers found -msgstr ÙÙ Ùت٠اÙعثÙر عÙ٠أجÙزة تØÙÙ Ù٠اÙ٠جا٠- -#: pam_winbind.c:329 -msgid No logon servers -msgstr Ùا تÙجد Ø®Ùاد٠تسجÙ٠اÙدخÙÙ - -#: pam_winbind.c:330 -msgid Password too short -msgstr ÙÙÙ Ø© اÙسر ÙصÙرة جدÙا - -#: pam_winbind.c:331 -msgid The password of this user is too recent to change -msgstr ÙÙÙ Ø© سر Ùذا اÙ٠ستخد٠ØدÙثة جدÙا عÙ٠اÙتغÙÙر - -#: pam_winbind.c:332 -msgid Password is already in password history -msgstr ÙÙÙ Ø© اÙسر Ù ÙجÙدة باÙÙع٠Ù٠سج٠ÙÙ٠ات اÙسر - -#: pam_winbind.c:333 -msgid Your password has expired -msgstr اÙتÙت صÙاØÙØ© ÙÙÙ Ø© اÙسر اÙخاصة ب٠- -#: pam_winbind.c:334 -msgid You need to change your password now -msgstr ÙÙز٠تغÙÙر ÙÙÙ Ø© اÙسر اÙØ¢Ù - -#: pam_winbind.c:335 -msgid You are not allowed to logon from this workstation -msgstr غÙر ٠س٠ÙØ Ù٠بتسجÙ٠اÙØ
[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha7-1312-gf8cc0e8
The branch, master has been updated
via f8cc0e88fbbb082ead023e0cb437b1e12cf35459 (commit)
from 077bcc11257697b243916fbb02cd72b3a122b9ba (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit f8cc0e88fbbb082ead023e0cb437b1e12cf35459
Author: Bo Yang boy...@novell.com
Date: Wed Apr 29 09:50:41 2009 +0800
s3: fix crash in winbindd
---
Summary of changes:
source3/libsmb/async_smb.c|4
source3/rpc_client/rpc_transport_np.c |6 ++
2 files changed, 10 insertions(+), 0 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/libsmb/async_smb.c b/source3/libsmb/async_smb.c
index 6faf96c..17040b8 100644
--- a/source3/libsmb/async_smb.c
+++ b/source3/libsmb/async_smb.c
@@ -604,6 +604,10 @@ bool cli_smb_req_send(struct tevent_req *req)
struct cli_smb_state *state = tevent_req_data(
req, struct cli_smb_state);
+ if (state-cli-fd == -1) {
+ return false;
+ }
+
return cli_smb_req_iov_send(req, state, state-iov, state-iov_count);
}
diff --git a/source3/rpc_client/rpc_transport_np.c
b/source3/rpc_client/rpc_transport_np.c
index 40d68dd..dceacf6 100644
--- a/source3/rpc_client/rpc_transport_np.c
+++ b/source3/rpc_client/rpc_transport_np.c
@@ -31,6 +31,12 @@ struct rpc_transport_np_state {
static int rpc_transport_np_state_destructor(struct rpc_transport_np_state *s)
{
bool ret;
+
+ if (s-cli-fd == -1) {
+ DEBUG(10, (socket was closed, no need to send close
request.\n));
+ return 0;
+ }
+
ret = cli_close(s-cli, s-fnum);
if (!ret) {
DEBUG(1, (rpc_transport_np_state_destructor: cli_close
--
Samba Shared Repository
