svn commit: samba-docs r1201 - in trunk/manpages-3: .
Author: lmuelle Date: 2007-11-01 13:45:31 + (Thu, 01 Nov 2007) New Revision: 1201 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=samba-docsrev=1201 Log: Fix type in SAM SET PWDMUSTCHANGENOW reported by Frederik Teichert of zmnh.uni-hamburg.de. Modified: trunk/manpages-3/net.8.xml Changeset: Modified: trunk/manpages-3/net.8.xml === --- trunk/manpages-3/net.8.xml 2007-10-30 14:04:26 UTC (rev 1200) +++ trunk/manpages-3/net.8.xml 2007-11-01 13:45:31 UTC (rev 1201) @@ -1122,7 +1122,7 @@ /refsect2 refsect2 -titleSAM SET PWMUSTCHANGENOW lt;NAMEgt; [yes|no]/title +titleSAM SET PWDMUSTCHANGENOW lt;NAMEgt; [yes|no]/title para Set or unset the password must change flag for a user account.
svn commit: samba r25029 - in branches/SAMBA_3_0_25/source/libads: .
Author: lmuelle
Date: 2007-09-08 13:35:56 + (Sat, 08 Sep 2007)
New Revision: 25029
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=25029
Log:
Merge revision 24836 from 3_2*. This is required by an outstanding patch.
Initialize some uninitialized variables.
This prevents a segfault when get_kdc_ip_string() is called
with sitename == NULL.
Modified:
branches/SAMBA_3_0_25/source/libads/kerberos.c
Changeset:
Modified: branches/SAMBA_3_0_25/source/libads/kerberos.c
===
--- branches/SAMBA_3_0_25/source/libads/kerberos.c 2007-09-08 13:34:42 UTC
(rev 25028)
+++ branches/SAMBA_3_0_25/source/libads/kerberos.c 2007-09-08 13:35:56 UTC
(rev 25029)
@@ -490,9 +490,11 @@
static char *get_kdc_ip_string(char *mem_ctx, const char *realm, const char
*sitename, struct in_addr primary_ip)
{
- struct ip_service *ip_srv_site;
- struct ip_service *ip_srv_nonsite;
- int count_site, count_nonsite, i;
+ int i;
+ struct ip_service *ip_srv_site = NULL;
+ struct ip_service *ip_srv_nonsite = NULL;
+ int count_site = 0;
+ int count_nonsite = 0;
char *kdc_str = talloc_asprintf(mem_ctx, \tkdc = %s\n,
inet_ntoa(primary_ip));
svn commit: samba r25030 - in branches: SAMBA_3_0_25/source/libads SAMBA_3_2/source/libads SAMBA_3_2_0/source/libads
Author: lmuelle
Date: 2007-09-08 13:53:08 + (Sat, 08 Sep 2007)
New Revision: 25030
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=25030
Log:
ip_srv_nonsite and count_nonsite are initialized in get_kdc_list() in any
case.
Modified:
branches/SAMBA_3_0_25/source/libads/kerberos.c
branches/SAMBA_3_2/source/libads/kerberos.c
branches/SAMBA_3_2_0/source/libads/kerberos.c
Changeset:
Modified: branches/SAMBA_3_0_25/source/libads/kerberos.c
===
--- branches/SAMBA_3_0_25/source/libads/kerberos.c 2007-09-08 13:35:56 UTC
(rev 25029)
+++ branches/SAMBA_3_0_25/source/libads/kerberos.c 2007-09-08 13:53:08 UTC
(rev 25030)
@@ -492,9 +492,9 @@
{
int i;
struct ip_service *ip_srv_site = NULL;
- struct ip_service *ip_srv_nonsite = NULL;
+ struct ip_service *ip_srv_nonsite;
int count_site = 0;
- int count_nonsite = 0;
+ int count_nonsite;
char *kdc_str = talloc_asprintf(mem_ctx, \tkdc = %s\n,
inet_ntoa(primary_ip));
Modified: branches/SAMBA_3_2/source/libads/kerberos.c
===
--- branches/SAMBA_3_2/source/libads/kerberos.c 2007-09-08 13:35:56 UTC (rev
25029)
+++ branches/SAMBA_3_2/source/libads/kerberos.c 2007-09-08 13:53:08 UTC (rev
25030)
@@ -618,9 +618,9 @@
{
int i;
struct ip_service *ip_srv_site = NULL;
- struct ip_service *ip_srv_nonsite = NULL;
+ struct ip_service *ip_srv_nonsite;
int count_site = 0;
- int count_nonsite = 0;
+ int count_nonsite;
char *kdc_str = talloc_asprintf(mem_ctx, \tkdc = %s\n,
inet_ntoa(primary_ip));
Modified: branches/SAMBA_3_2_0/source/libads/kerberos.c
===
--- branches/SAMBA_3_2_0/source/libads/kerberos.c 2007-09-08 13:35:56 UTC
(rev 25029)
+++ branches/SAMBA_3_2_0/source/libads/kerberos.c 2007-09-08 13:53:08 UTC
(rev 25030)
@@ -618,9 +618,9 @@
{
int i;
struct ip_service *ip_srv_site = NULL;
- struct ip_service *ip_srv_nonsite = NULL;
+ struct ip_service *ip_srv_nonsite;
int count_site = 0;
- int count_nonsite = 0;
+ int count_nonsite;
char *kdc_str = talloc_asprintf(mem_ctx, \tkdc = %s\n,
inet_ntoa(primary_ip));
svn commit: samba r25032 - in branches: SAMBA_3_0_25/source/libsmb SAMBA_3_0_25/source/nsswitch SAMBA_3_2/source/libsmb SAMBA_3_2/source/nsswitch SAMBA_3_2_0/source/libsmb SAMBA_3_2_0/source/nsswitch
Author: lmuelle
Date: 2007-09-08 14:56:11 + (Sat, 08 Sep 2007)
New Revision: 25032
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=25032
Log:
Contact an off site DC if non is available on site.
Modified:
branches/SAMBA_3_0_25/source/libsmb/namequery_dc.c
branches/SAMBA_3_0_25/source/nsswitch/winbindd_cm.c
branches/SAMBA_3_2/source/libsmb/namequery_dc.c
branches/SAMBA_3_2/source/nsswitch/winbindd_cm.c
branches/SAMBA_3_2_0/source/libsmb/namequery_dc.c
branches/SAMBA_3_2_0/source/nsswitch/winbindd_cm.c
Changeset:
Modified: branches/SAMBA_3_0_25/source/libsmb/namequery_dc.c
===
--- branches/SAMBA_3_0_25/source/libsmb/namequery_dc.c 2007-09-08 14:12:45 UTC
(rev 25031)
+++ branches/SAMBA_3_0_25/source/libsmb/namequery_dc.c 2007-09-08 14:56:11 UTC
(rev 25032)
@@ -99,15 +99,23 @@
}
#ifdef HAVE_KRB5
- if (is_our_primary_domain(domain) (ads-config.flags
ADS_KDC) ads_closest_dc(ads)) {
- /* We're going to use this KDC for this realm/domain.
- If we are using sites, then force the krb5 libs
- to use this KDC. */
+ if (is_our_primary_domain(domain) (ads-config.flags
ADS_KDC)) {
+ if (ads_closest_dc(ads)) {
+ /* We're going to use this KDC for this
realm/domain.
+ If we are using sites, then force the krb5
libs
+ to use this KDC. */
- create_local_private_krb5_conf_for_domain(realm,
- domain,
- sitename,
- ads-ldap_ip);
+ create_local_private_krb5_conf_for_domain(realm,
+ domain,
+
sitename,
+
ads-ldap_ip);
+ } else {
+ /* use an off site KDC */
+ create_local_private_krb5_conf_for_domain(realm,
+ domain,
+ NULL,
+
ads-ldap_ip);
+ }
}
#endif
break;
Modified: branches/SAMBA_3_0_25/source/nsswitch/winbindd_cm.c
===
--- branches/SAMBA_3_0_25/source/nsswitch/winbindd_cm.c 2007-09-08 14:12:45 UTC
(rev 25031)
+++ branches/SAMBA_3_0_25/source/nsswitch/winbindd_cm.c 2007-09-08 14:56:11 UTC
(rev 25032)
@@ -1032,19 +1032,27 @@
DEBUG(10,(dcip_to_name: flags = 0x%x\n, (unsigned
int)ads-config.flags));
- if (domain-primary (ads-config.flags ADS_KDC)
ads_closest_dc(ads)) {
- char *sitename =
sitename_fetch(ads-config.realm);
+ if (domain-primary (ads-config.flags ADS_KDC)) {
+ if (ads_closest_dc(ads)) {
+ char *sitename =
sitename_fetch(ads-config.realm);
- /* We're going to use this KDC for this
realm/domain.
- If we are using sites, then force the krb5
libs
- to use this KDC. */
+ /* We're going to use this KDC for this
realm/domain.
+ If we are using sites, then force
the krb5 libs
+ to use this KDC. */
-
create_local_private_krb5_conf_for_domain(domain-alt_name,
- domain-name,
- sitename,
- ip);
+
create_local_private_krb5_conf_for_domain(domain-alt_name,
+
domain-name,
+
sitename,
+ ip);
- SAFE_FREE(sitename);
+ SAFE_FREE(sitename);
+ } else {
+ /* use an off site KDC
svn commit: samba r24601 - in branches: SAMBA_3_2/source/client SAMBA_3_2/source/python SAMBA_3_2_0/source/client SAMBA_3_2_0/source/python
Author: lmuelle
Date: 2007-08-21 14:42:36 + (Tue, 21 Aug 2007)
New Revision: 24601
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=24601
Log:
Fix if statements where we still expected cli_connect() to return BOOL.
Modified:
branches/SAMBA_3_2/source/client/smbctool.c
branches/SAMBA_3_2/source/python/py_smb.c
branches/SAMBA_3_2_0/source/client/smbctool.c
branches/SAMBA_3_2_0/source/python/py_smb.c
Changeset:
Modified: branches/SAMBA_3_2/source/client/smbctool.c
===
--- branches/SAMBA_3_2/source/client/smbctool.c 2007-08-21 14:42:13 UTC (rev
24600)
+++ branches/SAMBA_3_2/source/client/smbctool.c 2007-08-21 14:42:36 UTC (rev
24601)
@@ -3494,7 +3494,7 @@
msg_port = port ? port : 139;
if (!(cli=cli_initialise()) || (cli_set_port(cli, msg_port) !=
msg_port) ||
- !cli_connect(cli, server_name, ip)) {
+ !NT_STATUS_IS_OK(cli_connect(cli, server_name, ip))) {
d_printf(Connection to %s failed\n, desthost);
return 1;
}
Modified: branches/SAMBA_3_2/source/python/py_smb.c
===
--- branches/SAMBA_3_2/source/python/py_smb.c 2007-08-21 14:42:13 UTC (rev
24600)
+++ branches/SAMBA_3_2/source/python/py_smb.c 2007-08-21 14:42:36 UTC (rev
24601)
@@ -47,7 +47,7 @@
ZERO_STRUCT(ip);
- if (!cli_connect(cli, server, ip))
+ if (!NT_STATUS_IS_OK(cli_connect(cli, server, ip)))
return NULL;
return new_cli_state_object(cli);
Modified: branches/SAMBA_3_2_0/source/client/smbctool.c
===
--- branches/SAMBA_3_2_0/source/client/smbctool.c 2007-08-21 14:42:13 UTC
(rev 24600)
+++ branches/SAMBA_3_2_0/source/client/smbctool.c 2007-08-21 14:42:36 UTC
(rev 24601)
@@ -3494,7 +3494,7 @@
msg_port = port ? port : 139;
if (!(cli=cli_initialise()) || (cli_set_port(cli, msg_port) !=
msg_port) ||
- !cli_connect(cli, server_name, ip)) {
+ !NT_STATUS_IS_OK(cli_connect(cli, server_name, ip))) {
d_printf(Connection to %s failed\n, desthost);
return 1;
}
Modified: branches/SAMBA_3_2_0/source/python/py_smb.c
===
--- branches/SAMBA_3_2_0/source/python/py_smb.c 2007-08-21 14:42:13 UTC (rev
24600)
+++ branches/SAMBA_3_2_0/source/python/py_smb.c 2007-08-21 14:42:36 UTC (rev
24601)
@@ -47,7 +47,7 @@
ZERO_STRUCT(ip);
- if (!cli_connect(cli, server, ip))
+ if (!NT_STATUS_IS_OK(cli_connect(cli, server, ip)))
return NULL;
return new_cli_state_object(cli);
svn commit: samba r23733 - in branches: SAMBA_3_0/source/nsswitch SAMBA_3_0_26/source/nsswitch
Author: lmuelle
Date: 2007-07-06 18:49:49 + (Fri, 06 Jul 2007)
New Revision: 23733
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=23733
Log:
Limit LDAP lookup in lookup_usergroups_member() to security groups.
Credits to Ralf Haferkamp for the discussion and help on this.
Modified:
branches/SAMBA_3_0/source/nsswitch/winbindd_ads.c
branches/SAMBA_3_0_26/source/nsswitch/winbindd_ads.c
Changeset:
Modified: branches/SAMBA_3_0/source/nsswitch/winbindd_ads.c
===
--- branches/SAMBA_3_0/source/nsswitch/winbindd_ads.c 2007-07-06 17:48:19 UTC
(rev 23732)
+++ branches/SAMBA_3_0/source/nsswitch/winbindd_ads.c 2007-07-06 18:49:49 UTC
(rev 23733)
@@ -570,7 +570,12 @@
goto done;
}
- if (!(ldap_exp = talloc_asprintf(mem_ctx,
((member=%s)(objectCategory=group)), escaped_dn))) {
+ ldap_exp = talloc_asprintf(mem_ctx,
+ ((member=%s)(objectCategory=group)(groupType:dn:%s:=%d)),
+ escaped_dn,
+ ADS_LDAP_MATCHING_RULE_BIT_AND,
+ GROUP_TYPE_SECURITY_ENABLED);
+ if (!ldap_exp) {
DEBUG(1,(lookup_usergroups(dn=%s) asprintf failed!\n,
user_dn));
SAFE_FREE(escaped_dn);
status = NT_STATUS_NO_MEMORY;
Modified: branches/SAMBA_3_0_26/source/nsswitch/winbindd_ads.c
===
--- branches/SAMBA_3_0_26/source/nsswitch/winbindd_ads.c2007-07-06
17:48:19 UTC (rev 23732)
+++ branches/SAMBA_3_0_26/source/nsswitch/winbindd_ads.c2007-07-06
18:49:49 UTC (rev 23733)
@@ -570,7 +570,12 @@
goto done;
}
- if (!(ldap_exp = talloc_asprintf(mem_ctx,
((member=%s)(objectCategory=group)), escaped_dn))) {
+ ldap_exp = talloc_asprintf(mem_ctx,
+ ((member=%s)(objectCategory=group)(groupType:dn:%s:=%d)),
+ escaped_dn,
+ ADS_LDAP_MATCHING_RULE_BIT_AND,
+ GROUP_TYPE_SECURITY_ENABLED);
+ if (!ldap_exp) {
DEBUG(1,(lookup_usergroups(dn=%s) asprintf failed!\n,
user_dn));
SAFE_FREE(escaped_dn);
status = NT_STATUS_NO_MEMORY;
svn commit: samba r23704 - in branches: SAMBA_3_0/examples/pam_winbind SAMBA_3_0/source/nsswitch SAMBA_3_0_26/examples/pam_winbind SAMBA_3_0_26/source/nsswitch
Author: lmuelle
Date: 2007-07-04 14:03:10 + (Wed, 04 Jul 2007)
New Revision: 23704
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=23704
Log:
Add pam_pwd_expire feature as discussed on samba-technical.
This is a slightly modified version to set warn_pwd_expire to the
default value if 0, no, or a broken value is set.
This version also has one if statement less in get_config_item_int().
Thanks a lot to Andreas 'GlaDiaC' Schneider for this feature!
Modified:
branches/SAMBA_3_0/examples/pam_winbind/pam_winbind.conf
branches/SAMBA_3_0/source/nsswitch/pam_winbind.c
branches/SAMBA_3_0/source/nsswitch/pam_winbind.h
branches/SAMBA_3_0_26/examples/pam_winbind/pam_winbind.conf
branches/SAMBA_3_0_26/source/nsswitch/pam_winbind.c
branches/SAMBA_3_0_26/source/nsswitch/pam_winbind.h
Changeset:
Modified: branches/SAMBA_3_0/examples/pam_winbind/pam_winbind.conf
===
--- branches/SAMBA_3_0/examples/pam_winbind/pam_winbind.conf2007-07-04
11:06:32 UTC (rev 23703)
+++ branches/SAMBA_3_0/examples/pam_winbind/pam_winbind.conf2007-07-04
14:03:10 UTC (rev 23704)
@@ -28,5 +28,8 @@
# (can also take a name)
;require_membership_of =
+# password expiry warning period in days
+;warn_pwd_expire = 14
+
# omit pam conversations
;silent = no
Modified: branches/SAMBA_3_0/source/nsswitch/pam_winbind.c
===
--- branches/SAMBA_3_0/source/nsswitch/pam_winbind.c2007-07-04 11:06:32 UTC
(rev 23703)
+++ branches/SAMBA_3_0/source/nsswitch/pam_winbind.c2007-07-04 14:03:10 UTC
(rev 23704)
@@ -561,7 +561,12 @@
* @return boolean Returns True if message has been sent, False if not.
*/
-static BOOL _pam_send_password_expiry_message(pam_handle_t *pamh, int ctrl,
time_t next_change, time_t now, BOOL *already_expired)
+static BOOL _pam_send_password_expiry_message(pam_handle_t *pamh,
+ int ctrl,
+ time_t next_change,
+ time_t now,
+ int warn_pwd_expire,
+ BOOL *already_expired)
{
int days = 0;
struct tm tm_now, tm_next_change;
@@ -579,7 +584,7 @@
}
if ((next_change 0) ||
- (next_change now + DAYS_TO_WARN_BEFORE_PWD_EXPIRES *
SECONDS_PER_DAY)) {
+ (next_change now + warn_pwd_expire * SECONDS_PER_DAY)) {
return False;
}
@@ -595,7 +600,7 @@
return True;
}
- if (days 0 days DAYS_TO_WARN_BEFORE_PWD_EXPIRES) {
+ if (days 0 days warn_pwd_expire) {
_make_remark_format(pamh, ctrl, PAM_TEXT_INFO, Your password
will expire in %d %s,
days, (days 1) ? days:day);
return True;
@@ -618,6 +623,7 @@
static void _pam_warn_password_expiry(pam_handle_t *pamh,
int flags,
const struct winbindd_response *response,
+ int warn_pwd_expire,
BOOL *already_expired)
{
time_t now = time(NULL);
@@ -640,7 +646,8 @@
/* check if the info3 must change timestamp has been set */
next_change = response-data.auth.info3.pass_must_change_time;
- if (_pam_send_password_expiry_message(pamh, flags, next_change, now,
+ if (_pam_send_password_expiry_message(pamh, flags, next_change, now,
+ warn_pwd_expire,
already_expired)) {
return;
}
@@ -655,7 +662,8 @@
next_change = response-data.auth.info3.pass_last_set_time +
response-data.auth.policy.expire;
- if (_pam_send_password_expiry_message(pamh, flags, next_change, now,
+ if (_pam_send_password_expiry_message(pamh, flags, next_change, now,
+ warn_pwd_expire,
already_expired)) {
return;
}
@@ -1029,6 +1037,7 @@
const char *pass,
const char *member,
const char *cctype,
+ const int warn_pwd_expire,
struct winbindd_response *p_response,
time_t *pwd_last_set,
char **user_ret)
@@ -1134,7 +1143,9 @@
if (ret == PAM_SUCCESS) {
/* warn a user if the password is about to expire soon */
- _pam_warn_password_expiry(pamh, ctrl, response,
already_expired);
+ _pam_warn_password_expiry(pamh, ctrl, response
svn commit: samba r23705 - in branches: SAMBA_3_0 SAMBA_3_0_26
Author: lmuelle Date: 2007-07-04 14:15:26 + (Wed, 04 Jul 2007) New Revision: 23705 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=23705 Log: Add suggestion for vim from Andreas 'GlaDiaC' Schneider to show tabs, trailing whitespace, and continued lines visually. Modified: branches/SAMBA_3_0/README.Coding branches/SAMBA_3_0_26/README.Coding Changeset: Modified: branches/SAMBA_3_0/README.Coding === --- branches/SAMBA_3_0/README.Coding2007-07-04 14:03:10 UTC (rev 23704) +++ branches/SAMBA_3_0/README.Coding2007-07-04 14:15:26 UTC (rev 23705) @@ -76,8 +76,9 @@ endf autocmd BufNewFile,BufRead * call ActivateInvisibleCharIndicator() endif + Show tabs, trailing whitespace, and continued lines visually + set list listchars=tab:»·,trail:·,extends:… - = FAQ Statement Reference = Modified: branches/SAMBA_3_0_26/README.Coding === --- branches/SAMBA_3_0_26/README.Coding 2007-07-04 14:03:10 UTC (rev 23704) +++ branches/SAMBA_3_0_26/README.Coding 2007-07-04 14:15:26 UTC (rev 23705) @@ -76,8 +76,9 @@ endf autocmd BufNewFile,BufRead * call ActivateInvisibleCharIndicator() endif + Show tabs, trailing whitespace, and continued lines visually + set list listchars=tab:»·,trail:·,extends:… - = FAQ Statement Reference =
svn commit: samba r23707 - in branches: SAMBA_3_0/source/nsswitch SAMBA_3_0_26/source/nsswitch
Author: lmuelle
Date: 2007-07-04 19:52:51 + (Wed, 04 Jul 2007)
New Revision: 23707
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=23707
Log:
- Move the asprintf() call to create the key even in
get_conf_item_string() to the later if statement.
- Also move the key definition to the later if statement in
get_conf_item_string() and get_conf_item_int().
Modified:
branches/SAMBA_3_0/source/nsswitch/pam_winbind.c
branches/SAMBA_3_0_26/source/nsswitch/pam_winbind.c
Changeset:
Modified: branches/SAMBA_3_0/source/nsswitch/pam_winbind.c
===
--- branches/SAMBA_3_0/source/nsswitch/pam_winbind.c2007-07-04 16:17:48 UTC
(rev 23706)
+++ branches/SAMBA_3_0/source/nsswitch/pam_winbind.c2007-07-04 19:52:51 UTC
(rev 23707)
@@ -1491,24 +1491,12 @@
{
int i = 0;
const char *parm_opt = NULL;
- char *key = NULL;
if (!(ctrl config_flag)) {
goto out;
}
/* let the pam opt take precedence over the pam_winbind.conf option */
-
- if (d != NULL) {
-
- if (!asprintf(key, global:%s, item)) {
- goto out;
- }
-
- parm_opt = iniparser_getstr(d, key);
- SAFE_FREE(key);
- }
-
for ( i=0; iargc; i++ ) {
if ((strncmp(argv[i], item, strlen(item)) == 0)) {
@@ -1524,6 +1512,15 @@
}
if (d != NULL) {
+ char *key = NULL;
+
+ if (!asprintf(key, global:%s, item)) {
+ goto out;
+ }
+
+ parm_opt = iniparser_getstr(d, key);
+ SAFE_FREE(key);
+
_pam_log_debug(pamh, ctrl, LOG_INFO, CONFIG file: %s '%s'\n,
item, parm_opt);
}
out:
@@ -1537,8 +1534,7 @@
dictionary *d,
const char *item)
{
- int parm_opt = -1, i = 0;
- char *key = NULL;
+ int i, parm_opt = -1;
/* let the pam opt take precedence over the pam_winbind.conf option */
for (i = 0; i argc; i++) {
@@ -1561,6 +1557,8 @@
}
if (d != NULL) {
+ char *key = NULL;
+
if (!asprintf(key, global:%s, item)) {
goto out;
}
Modified: branches/SAMBA_3_0_26/source/nsswitch/pam_winbind.c
===
--- branches/SAMBA_3_0_26/source/nsswitch/pam_winbind.c 2007-07-04 16:17:48 UTC
(rev 23706)
+++ branches/SAMBA_3_0_26/source/nsswitch/pam_winbind.c 2007-07-04 19:52:51 UTC
(rev 23707)
@@ -1491,24 +1491,12 @@
{
int i = 0;
const char *parm_opt = NULL;
- char *key = NULL;
if (!(ctrl config_flag)) {
goto out;
}
/* let the pam opt take precedence over the pam_winbind.conf option */
-
- if (d != NULL) {
-
- if (!asprintf(key, global:%s, item)) {
- goto out;
- }
-
- parm_opt = iniparser_getstr(d, key);
- SAFE_FREE(key);
- }
-
for ( i=0; iargc; i++ ) {
if ((strncmp(argv[i], item, strlen(item)) == 0)) {
@@ -1524,6 +1512,15 @@
}
if (d != NULL) {
+ char *key = NULL;
+
+ if (!asprintf(key, global:%s, item)) {
+ goto out;
+ }
+
+ parm_opt = iniparser_getstr(d, key);
+ SAFE_FREE(key);
+
_pam_log_debug(pamh, ctrl, LOG_INFO, CONFIG file: %s '%s'\n,
item, parm_opt);
}
out:
@@ -1537,8 +1534,7 @@
dictionary *d,
const char *item)
{
- int parm_opt = -1, i = 0;
- char *key = NULL;
+ int i, parm_opt = -1;
/* let the pam opt take precedence over the pam_winbind.conf option */
for (i = 0; i argc; i++) {
@@ -1561,6 +1557,8 @@
}
if (d != NULL) {
+ char *key = NULL;
+
if (!asprintf(key, global:%s, item)) {
goto out;
}
svn commit: samba r23708 - in branches: SAMBA_3_0/source/nsswitch SAMBA_3_0_26/source/nsswitch
Author: lmuelle
Date: 2007-07-04 20:25:29 + (Wed, 04 Jul 2007)
New Revision: 23708
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=23708
Log:
- Add define for WINBIND_WARN_PWD_EXPIRE.
- Add parameter config_flag to get_config_item_int() and do the same
check as in get_conf_item_string.
Modified:
branches/SAMBA_3_0/source/nsswitch/pam_winbind.c
branches/SAMBA_3_0/source/nsswitch/pam_winbind.h
branches/SAMBA_3_0_26/source/nsswitch/pam_winbind.c
branches/SAMBA_3_0_26/source/nsswitch/pam_winbind.h
Changeset:
Modified: branches/SAMBA_3_0/source/nsswitch/pam_winbind.c
===
--- branches/SAMBA_3_0/source/nsswitch/pam_winbind.c2007-07-04 19:52:51 UTC
(rev 23707)
+++ branches/SAMBA_3_0/source/nsswitch/pam_winbind.c2007-07-04 20:25:29 UTC
(rev 23708)
@@ -264,6 +264,10 @@
ctrl |= WINBIND_TRY_FIRST_PASS_ARG;
}
+ if (iniparser_getint(d, global:warn_pwd_expire, 0)) {
+ ctrl |= WINBIND_WARN_PWD_EXPIRE;
+ }
+
config_from_pam:
/* step through arguments */
for (i=argc,v=argv; i-- 0; ++v) {
@@ -1532,10 +1536,15 @@
const char **argv,
int ctrl,
dictionary *d,
- const char *item)
+ const char *item,
+ int config_flag)
{
int i, parm_opt = -1;
+ if (!(ctrl config_flag)) {
+ goto out;
+ }
+
/* let the pam opt take precedence over the pam_winbind.conf option */
for (i = 0; i argc; i++) {
@@ -1597,7 +1606,7 @@
{
int ret;
ret = get_config_item_int(pamh, argc, argv, ctrl, d,
- warn_pwd_expire);
+ warn_pwd_expire, WINBIND_WARN_PWD_EXPIRE);
/* no or broken setting */
if (ret = 0) {
return DEFAULT_DAYS_TO_WARN_BEFORE_PWD_EXPIRES;
Modified: branches/SAMBA_3_0/source/nsswitch/pam_winbind.h
===
--- branches/SAMBA_3_0/source/nsswitch/pam_winbind.h2007-07-04 19:52:51 UTC
(rev 23707)
+++ branches/SAMBA_3_0/source/nsswitch/pam_winbind.h2007-07-04 20:25:29 UTC
(rev 23708)
@@ -95,6 +95,7 @@
#define WINBIND_CONFIG_FILE (110)
#define WINBIND_SILENT (111)
#define WINBIND_DEBUG_STATE (112)
+#define WINBIND_WARN_PWD_EXPIRE (113)
/*
* here is the string to inform the user that the new passwords they
Modified: branches/SAMBA_3_0_26/source/nsswitch/pam_winbind.c
===
--- branches/SAMBA_3_0_26/source/nsswitch/pam_winbind.c 2007-07-04 19:52:51 UTC
(rev 23707)
+++ branches/SAMBA_3_0_26/source/nsswitch/pam_winbind.c 2007-07-04 20:25:29 UTC
(rev 23708)
@@ -264,6 +264,10 @@
ctrl |= WINBIND_TRY_FIRST_PASS_ARG;
}
+ if (iniparser_getint(d, global:warn_pwd_expire, 0)) {
+ ctrl |= WINBIND_WARN_PWD_EXPIRE;
+ }
+
config_from_pam:
/* step through arguments */
for (i=argc,v=argv; i-- 0; ++v) {
@@ -1532,10 +1536,15 @@
const char **argv,
int ctrl,
dictionary *d,
- const char *item)
+ const char *item,
+ int config_flag)
{
int i, parm_opt = -1;
+ if (!(ctrl config_flag)) {
+ goto out;
+ }
+
/* let the pam opt take precedence over the pam_winbind.conf option */
for (i = 0; i argc; i++) {
@@ -1597,7 +1606,7 @@
{
int ret;
ret = get_config_item_int(pamh, argc, argv, ctrl, d,
- warn_pwd_expire);
+ warn_pwd_expire, WINBIND_WARN_PWD_EXPIRE);
/* no or broken setting */
if (ret = 0) {
return DEFAULT_DAYS_TO_WARN_BEFORE_PWD_EXPIRES;
Modified: branches/SAMBA_3_0_26/source/nsswitch/pam_winbind.h
===
--- branches/SAMBA_3_0_26/source/nsswitch/pam_winbind.h 2007-07-04 19:52:51 UTC
(rev 23707)
+++ branches/SAMBA_3_0_26/source/nsswitch/pam_winbind.h 2007-07-04 20:25:29 UTC
(rev 23708)
@@ -95,6 +95,7 @@
#define WINBIND_CONFIG_FILE (110)
#define WINBIND_SILENT (111)
#define WINBIND_DEBUG_STATE (112)
+#define WINBIND_WARN_PWD_EXPIRE (113)
/*
* here is the string to inform the user that the new passwords they
svn commit: samba r23166 - in branches: SAMBA_3_0/source/iniparser SAMBA_3_0/source/iniparser/html SAMBA_3_0/source/iniparser/src SAMBA_3_0_26/source/iniparser SAMBA_3_0_26/source/iniparser/html SAMBA
Author: lmuelle Date: 2007-05-27 15:58:19 + (Sun, 27 May 2007) New Revision: 23166 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=23166 Log: Bring samba.org's iniparser copy in sync with the upstream version 2.17. Added: branches/SAMBA_3_0/source/iniparser/html/tab_b.gif branches/SAMBA_3_0/source/iniparser/html/tab_l.gif branches/SAMBA_3_0/source/iniparser/html/tab_r.gif branches/SAMBA_3_0/source/iniparser/html/tabs.css branches/SAMBA_3_0_26/source/iniparser/html/tab_b.gif branches/SAMBA_3_0_26/source/iniparser/html/tab_l.gif branches/SAMBA_3_0_26/source/iniparser/html/tab_r.gif branches/SAMBA_3_0_26/source/iniparser/html/tabs.css Removed: branches/SAMBA_3_0/source/iniparser/html/dir_00.html branches/SAMBA_3_0/source/iniparser/html/dirs.html branches/SAMBA_3_0_26/source/iniparser/html/dir_00.html branches/SAMBA_3_0_26/source/iniparser/html/dirs.html Modified: branches/SAMBA_3_0/source/iniparser/AUTHORS branches/SAMBA_3_0/source/iniparser/Makefile branches/SAMBA_3_0/source/iniparser/html/doxygen.css branches/SAMBA_3_0/source/iniparser/html/globals_func.html branches/SAMBA_3_0/source/iniparser/html/index.html branches/SAMBA_3_0/source/iniparser/html/iniparser_8h.html branches/SAMBA_3_0/source/iniparser/html/iniparser_8main.html branches/SAMBA_3_0/source/iniparser/src/dictionary.c branches/SAMBA_3_0/source/iniparser/src/dictionary.h branches/SAMBA_3_0/source/iniparser/src/iniparser.c branches/SAMBA_3_0/source/iniparser/src/iniparser.h branches/SAMBA_3_0/source/iniparser/src/strlib.c branches/SAMBA_3_0/source/iniparser/src/strlib.h branches/SAMBA_3_0_26/source/iniparser/AUTHORS branches/SAMBA_3_0_26/source/iniparser/Makefile branches/SAMBA_3_0_26/source/iniparser/html/doxygen.css branches/SAMBA_3_0_26/source/iniparser/html/globals_func.html branches/SAMBA_3_0_26/source/iniparser/html/index.html branches/SAMBA_3_0_26/source/iniparser/html/iniparser_8h.html branches/SAMBA_3_0_26/source/iniparser/html/iniparser_8main.html branches/SAMBA_3_0_26/source/iniparser/src/dictionary.c branches/SAMBA_3_0_26/source/iniparser/src/dictionary.h branches/SAMBA_3_0_26/source/iniparser/src/iniparser.c branches/SAMBA_3_0_26/source/iniparser/src/iniparser.h branches/SAMBA_3_0_26/source/iniparser/src/strlib.c branches/SAMBA_3_0_26/source/iniparser/src/strlib.h Changeset: Sorry, the patch is too large (3745 lines) to include; please use WebSVN to see it! WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=23166
svn commit: samba r23154 - in branches: SAMBA_3_0/source SAMBA_3_0_26/source
Author: lmuelle
Date: 2007-05-26 13:24:56 + (Sat, 26 May 2007)
New Revision: 23154
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=23154
Log:
Add INSTALLPERMS_DATA set to 0644 to install the header files with this
permission set instead of 0755.
Modified:
branches/SAMBA_3_0/source/Makefile.in
branches/SAMBA_3_0_26/source/Makefile.in
Changeset:
Modified: branches/SAMBA_3_0/source/Makefile.in
===
--- branches/SAMBA_3_0/source/Makefile.in 2007-05-26 08:47:27 UTC (rev
23153)
+++ branches/SAMBA_3_0/source/Makefile.in 2007-05-26 13:24:56 UTC (rev
23154)
@@ -91,8 +91,9 @@
MANDIR = @mandir@
DATADIR = @datadir@
-# The permissions to give the executables
+# The permissions to give the executables and other data
INSTALLPERMS = 0755
+INSTALLPERMS_DATA = 0644
# set these to where to find various files
# These can be overridden by command line switches (see smbd(8))
@@ -1775,14 +1776,14 @@
-$(INSTALLLIBCMD_SH) bin/[EMAIL PROTECTED]@ $(DESTDIR)$(LIBDIR)
-$(INSTALLLIBCMD_A) bin/libsmbclient.a $(DESTDIR)$(LIBDIR)
@$(SHELL) $(srcdir)/script/installdirs.sh $(INSTALLPERMS) $(DESTDIR)
${prefix}/include
- -$(INSTALLCMD) $(srcdir)/include/libsmbclient.h
$(DESTDIR)${prefix}/include
+ -$(INSTALLCMD) -m $(INSTALLPERMS_DATA) $(srcdir)/include/libsmbclient.h
$(DESTDIR)${prefix}/include
installlibmsrpc: installdirs libmsrpc
@$(SHELL) $(srcdir)/script/installdirs.sh $(INSTALLPERMS) $(DESTDIR)
$(LIBDIR)
-$(INSTALLLIBCMD_SH) bin/[EMAIL PROTECTED]@ $(DESTDIR)$(LIBDIR)
-$(INSTALLLIBCMD_A) bin/libmsrpc.a $(DESTDIR)$(LIBDIR)
@$(SHELL) $(srcdir)/script/installdirs.sh $(INSTALLPERMS) $(DESTDIR)
${prefix}/include
- -$(INSTALLCMD) $(srcdir)/include/libmsrpc.h $(DESTDIR)${prefix}/include
+ -$(INSTALLCMD) -m $(INSTALLPERMS_DATA) $(srcdir)/include/libmsrpc.h
$(DESTDIR)${prefix}/include
installlibsmbsharemodes: installdirs libsmbsharemodes
@$(SHELL) $(srcdir)/script/installdirs.sh $(INSTALLPERMS) $(DESTDIR)
$(LIBDIR)
Modified: branches/SAMBA_3_0_26/source/Makefile.in
===
--- branches/SAMBA_3_0_26/source/Makefile.in2007-05-26 08:47:27 UTC (rev
23153)
+++ branches/SAMBA_3_0_26/source/Makefile.in2007-05-26 13:24:56 UTC (rev
23154)
@@ -84,8 +84,9 @@
MANDIR = @mandir@
DATADIR = @datadir@
-# The permissions to give the executables
+# The permissions to give the executables and other data
INSTALLPERMS = 0755
+INSTALLPERMS_DATA = 0644
# set these to where to find various files
# These can be overridden by command line switches (see smbd(8))
@@ -1653,14 +1654,14 @@
-$(INSTALLLIBCMD_SH) bin/[EMAIL PROTECTED]@ $(DESTDIR)$(LIBDIR)
-$(INSTALLLIBCMD_A) bin/libsmbclient.a $(DESTDIR)$(LIBDIR)
@$(SHELL) $(srcdir)/script/installdirs.sh $(INSTALLPERMS) $(DESTDIR)
${prefix}/include
- -$(INSTALLCMD) $(srcdir)/include/libsmbclient.h
$(DESTDIR)${prefix}/include
+ -$(INSTALLCMD) -m $(INSTALLPERMS_DATA) $(srcdir)/include/libsmbclient.h
$(DESTDIR)${prefix}/include
installlibmsrpc: installdirs libmsrpc
@$(SHELL) $(srcdir)/script/installdirs.sh $(INSTALLPERMS) $(DESTDIR)
$(LIBDIR)
-$(INSTALLLIBCMD_SH) bin/[EMAIL PROTECTED]@ $(DESTDIR)$(LIBDIR)
-$(INSTALLLIBCMD_A) bin/libmsrpc.a $(DESTDIR)$(LIBDIR)
@$(SHELL) $(srcdir)/script/installdirs.sh $(INSTALLPERMS) $(DESTDIR)
${prefix}/include
- -$(INSTALLCMD) $(srcdir)/include/libmsrpc.h $(DESTDIR)${prefix}/include
+ -$(INSTALLCMD) -m $(INSTALLPERMS_DATA) $(srcdir)/include/libmsrpc.h
$(DESTDIR)${prefix}/include
installlibsmbsharemodes: installdirs libsmbsharemodes
@$(SHELL) $(srcdir)/script/installdirs.sh $(INSTALLPERMS) $(DESTDIR)
$(LIBDIR)
svn commit: samba r23155 - in branches: SAMBA_3_0/source SAMBA_3_0_26/source
Author: lmuelle Date: 2007-05-26 13:30:45 + (Sat, 26 May 2007) New Revision: 23155 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=23155 Log: Rename INSTALLPERMS to INSTALLPERMS_BIN to differenciate clearer from INSTALLPERMS_DATA. Modified: branches/SAMBA_3_0/source/Makefile.in branches/SAMBA_3_0_26/source/Makefile.in Changeset: Modified: branches/SAMBA_3_0/source/Makefile.in === --- branches/SAMBA_3_0/source/Makefile.in 2007-05-26 13:24:56 UTC (rev 23154) +++ branches/SAMBA_3_0/source/Makefile.in 2007-05-26 13:30:45 UTC (rev 23155) @@ -92,7 +92,7 @@ DATADIR = @datadir@ # The permissions to give the executables and other data -INSTALLPERMS = 0755 +INSTALLPERMS_BIN = 0755 INSTALLPERMS_DATA = 0644 # set these to where to find various files @@ -1728,28 +1728,28 @@ # is not used installdirs: - @$(SHELL) $(srcdir)/script/installdirs.sh $(INSTALLPERMS) $(DESTDIR) $(prefix) $(BINDIR) $(SBINDIR) $(LIBDIR) $(VARDIR) $(PRIVATEDIR) $(PIDDIR) $(LOCKDIR) $(MANDIR) + @$(SHELL) $(srcdir)/script/installdirs.sh $(INSTALLPERMS_BIN) $(DESTDIR) $(prefix) $(BINDIR) $(SBINDIR) $(LIBDIR) $(VARDIR) $(PRIVATEDIR) $(PIDDIR) $(LOCKDIR) $(MANDIR) installservers: all installdirs - @$(SHELL) script/installbin.sh $(INSTALLPERMS) $(DESTDIR) $(prefix) $(SBINDIR) $(SBIN_PROGS) + @$(SHELL) script/installbin.sh $(INSTALLPERMS_BIN) $(DESTDIR) $(prefix) $(SBINDIR) $(SBIN_PROGS) installbin: all installdirs - @$(SHELL) script/installbin.sh $(INSTALLPERMS) $(DESTDIR) $(prefix) $(BINDIR) $(BIN_PROGS) + @$(SHELL) script/installbin.sh $(INSTALLPERMS_BIN) $(DESTDIR) $(prefix) $(BINDIR) $(BIN_PROGS) installcifsmount: @CIFSMOUNT_PROGS@ - @$(SHELL) $(srcdir)/script/installdirs.sh $(INSTALLPERMS) $(DESTDIR) $(ROOTSBINDIR) - @$(SHELL) script/installbin.sh $(INSTALLPERMS) $(DESTDIR) $(prefix) $(ROOTSBINDIR) @CIFSMOUNT_PROGS@ + @$(SHELL) $(srcdir)/script/installdirs.sh $(INSTALLPERMS_BIN) $(DESTDIR) $(ROOTSBINDIR) + @$(SHELL) script/installbin.sh $(INSTALLPERMS_BIN) $(DESTDIR) $(prefix) $(ROOTSBINDIR) @CIFSMOUNT_PROGS@ # Some symlinks are required for the 'probing' of modules. # This mechanism should go at some point.. installmodules: modules installdirs - @$(SHELL) $(srcdir)/script/installmodules.sh $(INSTALLPERMS) $(DESTDIR) $(prefix) $(VFSLIBDIR) $(VFS_MODULES) - @$(SHELL) $(srcdir)/script/installmodules.sh $(INSTALLPERMS) $(DESTDIR) $(prefix) $(PDBLIBDIR) $(PDB_MODULES) - @$(SHELL) $(srcdir)/script/installmodules.sh $(INSTALLPERMS) $(DESTDIR) $(prefix) $(RPCLIBDIR) $(RPC_MODULES) - @$(SHELL) $(srcdir)/script/installmodules.sh $(INSTALLPERMS) $(DESTDIR) $(prefix) $(IDMAPLIBDIR) $(IDMAP_MODULES) - @$(SHELL) $(srcdir)/script/installmodules.sh $(INSTALLPERMS) $(DESTDIR) $(prefix) $(NSSINFOLIBDIR) $(NSS_INFO_MODULES) - @$(SHELL) $(srcdir)/script/installmodules.sh $(INSTALLPERMS) $(DESTDIR) $(prefix) $(CHARSETLIBDIR) $(CHARSET_MODULES) - @$(SHELL) $(srcdir)/script/installmodules.sh $(INSTALLPERMS) $(DESTDIR) $(prefix) $(AUTHLIBDIR) $(AUTH_MODULES) + @$(SHELL) $(srcdir)/script/installmodules.sh $(INSTALLPERMS_BIN) $(DESTDIR) $(prefix) $(VFSLIBDIR) $(VFS_MODULES) + @$(SHELL) $(srcdir)/script/installmodules.sh $(INSTALLPERMS_BIN) $(DESTDIR) $(prefix) $(PDBLIBDIR) $(PDB_MODULES) + @$(SHELL) $(srcdir)/script/installmodules.sh $(INSTALLPERMS_BIN) $(DESTDIR) $(prefix) $(RPCLIBDIR) $(RPC_MODULES) + @$(SHELL) $(srcdir)/script/installmodules.sh $(INSTALLPERMS_BIN) $(DESTDIR) $(prefix) $(IDMAPLIBDIR) $(IDMAP_MODULES) + @$(SHELL) $(srcdir)/script/installmodules.sh $(INSTALLPERMS_BIN) $(DESTDIR) $(prefix) $(NSSINFOLIBDIR) $(NSS_INFO_MODULES) + @$(SHELL) $(srcdir)/script/installmodules.sh $(INSTALLPERMS_BIN) $(DESTDIR) $(prefix) $(CHARSETLIBDIR) $(CHARSET_MODULES) + @$(SHELL) $(srcdir)/script/installmodules.sh $(INSTALLPERMS_BIN) $(DESTDIR) $(prefix) $(AUTHLIBDIR) $(AUTH_MODULES) @$(SHELL) $(srcdir)/script/linkmodules.sh $(DESTDIR)$(PDBLIBDIR) [EMAIL PROTECTED]@ [EMAIL PROTECTED]@ @$(SHELL) $(srcdir)/script/linkmodules.sh $(DESTDIR)$(PDBLIBDIR) [EMAIL PROTECTED]@ [EMAIL PROTECTED]@ @$(SHELL) $(srcdir)/script/linkmodules.sh $(DESTDIR)$(PDBLIBDIR) [EMAIL PROTECTED]@ [EMAIL PROTECTED]@ @@ -1760,7 +1760,7 @@ @$(SHELL) $(srcdir)/script/linkmodules.sh $(DESTDIR)$(NSSINFOLIBDIR) ../idmap/[EMAIL PROTECTED]@ [EMAIL PROTECTED]@ [EMAIL PROTECTED]@ installscripts: installdirs - @$(SHELL) $(srcdir)/script/installscripts.sh $(INSTALLPERMS) $(DESTDIR)$(BINDIR) $(SCRIPTS) + @$(SHELL) $(srcdir)/script/installscripts.sh $(INSTALLPERMS_BIN) $(DESTDIR)$(BINDIR) $(SCRIPTS) installdat: installdirs @$(SHELL) $(srcdir)/script/installdat.sh $(DESTDIR) $(LIBDIR) $(srcdir) @@ -1772,34 +1772,34 @@ @$(SHELL) $(srcdir
svn commit: samba r23156 - in branches: SAMBA_3_0/source SAMBA_3_0_26/source
Author: lmuelle
Date: 2007-05-26 13:33:56 + (Sat, 26 May 2007)
New Revision: 23156
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=23156
Log:
Install the smb_share_modes.h header file.
Modified:
branches/SAMBA_3_0/source/Makefile.in
branches/SAMBA_3_0_26/source/Makefile.in
Changeset:
Modified: branches/SAMBA_3_0/source/Makefile.in
===
--- branches/SAMBA_3_0/source/Makefile.in 2007-05-26 13:30:45 UTC (rev
23155)
+++ branches/SAMBA_3_0/source/Makefile.in 2007-05-26 13:33:56 UTC (rev
23156)
@@ -1789,6 +1789,7 @@
@$(SHELL) $(srcdir)/script/installdirs.sh $(INSTALLPERMS_BIN)
$(DESTDIR) $(LIBDIR)
-$(INSTALLLIBCMD_SH) bin/[EMAIL PROTECTED]@ $(DESTDIR)$(LIBDIR)
-$(INSTALLLIBCMD_A) bin/libsmbsharemodes.a $(DESTDIR)$(LIBDIR)
+ -$(INSTALLCMD) -m $(INSTALLPERMS_DATA)
$(srcdir)/include/smb_share_modes.h $(DESTDIR)${prefix}/include
installlibaddns: installdirs libaddns
@$(SHELL) $(srcdir)/script/installdirs.sh $(INSTALLPERMS_BIN)
$(DESTDIR) $(LIBDIR)
Modified: branches/SAMBA_3_0_26/source/Makefile.in
===
--- branches/SAMBA_3_0_26/source/Makefile.in2007-05-26 13:30:45 UTC (rev
23155)
+++ branches/SAMBA_3_0_26/source/Makefile.in2007-05-26 13:33:56 UTC (rev
23156)
@@ -1667,6 +1667,7 @@
@$(SHELL) $(srcdir)/script/installdirs.sh $(INSTALLPERMS_BIN)
$(DESTDIR) $(LIBDIR)
-$(INSTALLLIBCMD_SH) bin/[EMAIL PROTECTED]@ $(DESTDIR)$(LIBDIR)
-$(INSTALLLIBCMD_A) bin/libsmbsharemodes.a $(DESTDIR)$(LIBDIR)
+ -$(INSTALLCMD) -m $(INSTALLPERMS_DATA)
$(srcdir)/include/smb_share_modes.h $(DESTDIR)${prefix}/include
installlibaddns: installdirs libaddns
@$(SHELL) $(srcdir)/script/installdirs.sh $(INSTALLPERMS_BIN)
$(DESTDIR) $(LIBDIR)
svn commit: samba r22839 - in branches: SAMBA_3_0/source/include SAMBA_3_0_25/source/include SAMBA_3_0_26/source/include
Author: lmuelle Date: 2007-05-14 09:44:26 + (Mon, 14 May 2007) New Revision: 22839 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=22839 Log: Fix endif comment. Modified: branches/SAMBA_3_0/source/include/ads_cldap.h branches/SAMBA_3_0_25/source/include/ads_cldap.h branches/SAMBA_3_0_26/source/include/ads_cldap.h Changeset: Modified: branches/SAMBA_3_0/source/include/ads_cldap.h === --- branches/SAMBA_3_0/source/include/ads_cldap.h 2007-05-14 05:53:26 UTC (rev 22838) +++ branches/SAMBA_3_0/source/include/ads_cldap.h 2007-05-14 09:44:26 UTC (rev 22839) @@ -58,4 +58,4 @@ #define ADS_GOOD_TIMESERV 0x0200 /* DC has hardware clock (and running time) */ #define ADS_NDNC 0x0400 /* DomainName is non-domain NC serviced by LDAP server */ -#endif /* _INCLUDE_CLDAP_H_ */ +#endif /* _INCLUDE_ADS_CLDAP_H_ */ Modified: branches/SAMBA_3_0_25/source/include/ads_cldap.h === --- branches/SAMBA_3_0_25/source/include/ads_cldap.h2007-05-14 05:53:26 UTC (rev 22838) +++ branches/SAMBA_3_0_25/source/include/ads_cldap.h2007-05-14 09:44:26 UTC (rev 22839) @@ -58,4 +58,4 @@ #define ADS_GOOD_TIMESERV 0x0200 /* DC has hardware clock (and running time) */ #define ADS_NDNC 0x0400 /* DomainName is non-domain NC serviced by LDAP server */ -#endif /* _INCLUDE_CLDAP_H_ */ +#endif /* _INCLUDE_ADS_CLDAP_H_ */ Modified: branches/SAMBA_3_0_26/source/include/ads_cldap.h === --- branches/SAMBA_3_0_26/source/include/ads_cldap.h2007-05-14 05:53:26 UTC (rev 22838) +++ branches/SAMBA_3_0_26/source/include/ads_cldap.h2007-05-14 09:44:26 UTC (rev 22839) @@ -58,4 +58,4 @@ #define ADS_GOOD_TIMESERV 0x0200 /* DC has hardware clock (and running time) */ #define ADS_NDNC 0x0400 /* DomainName is non-domain NC serviced by LDAP server */ -#endif /* _INCLUDE_CLDAP_H_ */ +#endif /* _INCLUDE_ADS_CLDAP_H_ */
svn commit: samba r22841 - in branches: SAMBA_3_0/source/include SAMBA_3_0_25/source/include SAMBA_3_0_26/source/include
Author: lmuelle Date: 2007-05-14 09:50:39 + (Mon, 14 May 2007) New Revision: 22841 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=22841 Log: Add comment to endif statement. Modified: branches/SAMBA_3_0/source/include/ads.h branches/SAMBA_3_0_25/source/include/ads.h branches/SAMBA_3_0_26/source/include/ads.h Changeset: Modified: branches/SAMBA_3_0/source/include/ads.h === --- branches/SAMBA_3_0/source/include/ads.h 2007-05-14 09:47:58 UTC (rev 22840) +++ branches/SAMBA_3_0/source/include/ads.h 2007-05-14 09:50:39 UTC (rev 22841) @@ -328,4 +328,4 @@ int val; int critical; } ads_control; -#endif +#endif /* _INCLUDE_ADS_H_ */ Modified: branches/SAMBA_3_0_25/source/include/ads.h === --- branches/SAMBA_3_0_25/source/include/ads.h 2007-05-14 09:47:58 UTC (rev 22840) +++ branches/SAMBA_3_0_25/source/include/ads.h 2007-05-14 09:50:39 UTC (rev 22841) @@ -321,4 +321,4 @@ int val; int critical; } ads_control; -#endif +#endif /* _INCLUDE_ADS_H_ */ Modified: branches/SAMBA_3_0_26/source/include/ads.h === --- branches/SAMBA_3_0_26/source/include/ads.h 2007-05-14 09:47:58 UTC (rev 22840) +++ branches/SAMBA_3_0_26/source/include/ads.h 2007-05-14 09:50:39 UTC (rev 22841) @@ -328,4 +328,4 @@ int val; int critical; } ads_control; -#endif +#endif /* _INCLUDE_ADS_H_ */
svn commit: samba r22869 - in branches: SAMBA_3_0/source SAMBA_3_0_25/source SAMBA_3_0_26/source
Author: lmuelle
Date: 2007-05-14 21:22:14 + (Mon, 14 May 2007)
New Revision: 22869
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=22869
Log:
Add bin/{ldap,nss,[EMAIL PROTECTED]@ rules.
Not tested for SAMBA_3_0 as I didn't get autogen.sh or autoreconf to
build a configure.
Modified:
branches/SAMBA_3_0/source/Makefile.in
branches/SAMBA_3_0_25/source/Makefile.in
branches/SAMBA_3_0_26/source/Makefile.in
Changeset:
Modified: branches/SAMBA_3_0/source/Makefile.in
===
--- branches/SAMBA_3_0/source/Makefile.in 2007-05-14 20:31:28 UTC (rev
22868)
+++ branches/SAMBA_3_0/source/Makefile.in 2007-05-14 21:22:14 UTC (rev
22869)
@@ -1499,10 +1499,22 @@
@echo Building plugin $@
@$(SHLD_MODULE) nsswitch/idmap_rid.o
-bin/[EMAIL PROTECTED]@: nsswitch/idmap_ad.o
+bin/[EMAIL PROTECTED]@: proto_exists nsswitch/idmap_ad.o
@echo Building plugin $@
@$(SHLD_MODULE) nsswitch/idmap_ad.o
+bin/[EMAIL PROTECTED]@: proto_exists nsswitch/idmap_ldap.o
+ @echo Building plugin $@
+ @$(SHLD_MODULE) nsswitch/idmap_ldap.o
+
+bin/[EMAIL PROTECTED]@: proto_exists nsswitch/idmap_nss.o
+ @echo Building plugin $@
+ @$(SHLD_MODULE) nsswitch/idmap_nss.o
+
+bin/[EMAIL PROTECTED]@: proto_exists nsswitch/idmap_tdb.o
+ @echo Building plugin $@
+ @$(SHLD_MODULE) nsswitch/idmap_tdb.o
+
bin/[EMAIL PROTECTED]@: proto_exists $(DEVEL_HELP_WEIRD_OBJ)
@echo Building plugin $@
@$(SHLD_MODULE) $(DEVEL_HELP_WEIRD_OBJ)
Modified: branches/SAMBA_3_0_25/source/Makefile.in
===
--- branches/SAMBA_3_0_25/source/Makefile.in2007-05-14 20:31:28 UTC (rev
22868)
+++ branches/SAMBA_3_0_25/source/Makefile.in2007-05-14 21:22:14 UTC (rev
22869)
@@ -1349,11 +1349,26 @@
@$(SHLD) $(LDSHFLAGS) -o $@ nsswitch/idmap_rid.o \
@[EMAIL PROTECTED] [EMAIL PROTECTED]
-bin/[EMAIL PROTECTED]@: nsswitch/idmap_ad.o
+bin/[EMAIL PROTECTED]@: proto_exists nsswitch/idmap_ad.o
@echo Building plugin $@
@$(SHLD) $(LDSHFLAGS) -o $@ nsswitch/idmap_ad.o \
@[EMAIL PROTECTED] [EMAIL PROTECTED]
+bin/[EMAIL PROTECTED]@: proto_exists nsswitch/idmap_ldap.o
+ @echo Building plugin $@
+ @$(SHLD) $(LDSHFLAGS) -o $@ nsswitch/idmap_ldap.o \
+ @[EMAIL PROTECTED] [EMAIL PROTECTED]
+
+bin/[EMAIL PROTECTED]@: proto_exists nsswitch/idmap_nss.o
+ @echo Building plugin $@
+ @$(SHLD) $(LDSHFLAGS) -o $@ nsswitch/idmap_nss.o \
+ @[EMAIL PROTECTED] [EMAIL PROTECTED]
+
+bin/[EMAIL PROTECTED]@: proto_exists nsswitch/idmap_tdb.o
+ @echo Building plugin $@
+ @$(SHLD) $(LDSHFLAGS) -o $@ nsswitch/idmap_tdb.o \
+ @[EMAIL PROTECTED] [EMAIL PROTECTED]
+
bin/[EMAIL PROTECTED]@: proto_exists $(DEVEL_HELP_WEIRD_OBJ)
@echo Building plugin $@
@$(SHLD) $(LDSHFLAGS) -o $@ $(DEVEL_HELP_WEIRD_OBJ) \
Modified: branches/SAMBA_3_0_26/source/Makefile.in
===
--- branches/SAMBA_3_0_26/source/Makefile.in2007-05-14 20:31:28 UTC (rev
22868)
+++ branches/SAMBA_3_0_26/source/Makefile.in2007-05-14 21:22:14 UTC (rev
22869)
@@ -1350,11 +1350,26 @@
@$(SHLD) $(LDSHFLAGS) -o $@ nsswitch/idmap_rid.o \
@[EMAIL PROTECTED] [EMAIL PROTECTED]
-bin/[EMAIL PROTECTED]@: nsswitch/idmap_ad.o
+bin/[EMAIL PROTECTED]@: proto_exists nsswitch/idmap_ad.o
@echo Building plugin $@
@$(SHLD) $(LDSHFLAGS) -o $@ nsswitch/idmap_ad.o \
@[EMAIL PROTECTED] [EMAIL PROTECTED]
+bin/[EMAIL PROTECTED]@: proto_exists nsswitch/idmap_ldap.o
+ @echo Building plugin $@
+ @$(SHLD) $(LDSHFLAGS) -o $@ nsswitch/idmap_ldap.o \
+ @[EMAIL PROTECTED] [EMAIL PROTECTED]
+
+bin/[EMAIL PROTECTED]@: proto_exists nsswitch/idmap_nss.o
+ @echo Building plugin $@
+ @$(SHLD) $(LDSHFLAGS) -o $@ nsswitch/idmap_nss.o \
+ @[EMAIL PROTECTED] [EMAIL PROTECTED]
+
+bin/[EMAIL PROTECTED]@: proto_exists nsswitch/idmap_tdb.o
+ @echo Building plugin $@
+ @$(SHLD) $(LDSHFLAGS) -o $@ nsswitch/idmap_tdb.o \
+ @[EMAIL PROTECTED] [EMAIL PROTECTED]
+
bin/[EMAIL PROTECTED]@: proto_exists $(DEVEL_HELP_WEIRD_OBJ)
@echo Building plugin $@
@$(SHLD) $(LDSHFLAGS) -o $@ $(DEVEL_HELP_WEIRD_OBJ) \
svn commit: samba r22870 - in branches: SAMBA_3_0/source SAMBA_3_0_25/source SAMBA_3_0_26/source
Author: lmuelle Date: 2007-05-14 21:58:23 + (Mon, 14 May 2007) New Revision: 22870 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=22870 Log: Don't create shared objects of nss and tdb modules. Modified: branches/SAMBA_3_0/source/Makefile.in branches/SAMBA_3_0_25/source/Makefile.in branches/SAMBA_3_0_26/source/Makefile.in Changeset: Modified: branches/SAMBA_3_0/source/Makefile.in === --- branches/SAMBA_3_0/source/Makefile.in 2007-05-14 21:22:14 UTC (rev 22869) +++ branches/SAMBA_3_0/source/Makefile.in 2007-05-14 21:58:23 UTC (rev 22870) @@ -1507,14 +1507,6 @@ @echo Building plugin $@ @$(SHLD_MODULE) nsswitch/idmap_ldap.o -bin/[EMAIL PROTECTED]@: proto_exists nsswitch/idmap_nss.o - @echo Building plugin $@ - @$(SHLD_MODULE) nsswitch/idmap_nss.o - -bin/[EMAIL PROTECTED]@: proto_exists nsswitch/idmap_tdb.o - @echo Building plugin $@ - @$(SHLD_MODULE) nsswitch/idmap_tdb.o - bin/[EMAIL PROTECTED]@: proto_exists $(DEVEL_HELP_WEIRD_OBJ) @echo Building plugin $@ @$(SHLD_MODULE) $(DEVEL_HELP_WEIRD_OBJ) Modified: branches/SAMBA_3_0_25/source/Makefile.in === --- branches/SAMBA_3_0_25/source/Makefile.in2007-05-14 21:22:14 UTC (rev 22869) +++ branches/SAMBA_3_0_25/source/Makefile.in2007-05-14 21:58:23 UTC (rev 22870) @@ -1359,16 +1359,6 @@ @$(SHLD) $(LDSHFLAGS) -o $@ nsswitch/idmap_ldap.o \ @[EMAIL PROTECTED] [EMAIL PROTECTED] -bin/[EMAIL PROTECTED]@: proto_exists nsswitch/idmap_nss.o - @echo Building plugin $@ - @$(SHLD) $(LDSHFLAGS) -o $@ nsswitch/idmap_nss.o \ - @[EMAIL PROTECTED] [EMAIL PROTECTED] - -bin/[EMAIL PROTECTED]@: proto_exists nsswitch/idmap_tdb.o - @echo Building plugin $@ - @$(SHLD) $(LDSHFLAGS) -o $@ nsswitch/idmap_tdb.o \ - @[EMAIL PROTECTED] [EMAIL PROTECTED] - bin/[EMAIL PROTECTED]@: proto_exists $(DEVEL_HELP_WEIRD_OBJ) @echo Building plugin $@ @$(SHLD) $(LDSHFLAGS) -o $@ $(DEVEL_HELP_WEIRD_OBJ) \ Modified: branches/SAMBA_3_0_26/source/Makefile.in === --- branches/SAMBA_3_0_26/source/Makefile.in2007-05-14 21:22:14 UTC (rev 22869) +++ branches/SAMBA_3_0_26/source/Makefile.in2007-05-14 21:58:23 UTC (rev 22870) @@ -1360,16 +1360,6 @@ @$(SHLD) $(LDSHFLAGS) -o $@ nsswitch/idmap_ldap.o \ @[EMAIL PROTECTED] [EMAIL PROTECTED] -bin/[EMAIL PROTECTED]@: proto_exists nsswitch/idmap_nss.o - @echo Building plugin $@ - @$(SHLD) $(LDSHFLAGS) -o $@ nsswitch/idmap_nss.o \ - @[EMAIL PROTECTED] [EMAIL PROTECTED] - -bin/[EMAIL PROTECTED]@: proto_exists nsswitch/idmap_tdb.o - @echo Building plugin $@ - @$(SHLD) $(LDSHFLAGS) -o $@ nsswitch/idmap_tdb.o \ - @[EMAIL PROTECTED] [EMAIL PROTECTED] - bin/[EMAIL PROTECTED]@: proto_exists $(DEVEL_HELP_WEIRD_OBJ) @echo Building plugin $@ @$(SHLD) $(LDSHFLAGS) -o $@ $(DEVEL_HELP_WEIRD_OBJ) \
svn commit: samba r22805 - in branches: SAMBA_3_0/examples/pdb SAMBA_3_0_25/examples/pdb
Author: lmuelle Date: 2007-05-11 20:42:51 + (Fri, 11 May 2007) New Revision: 22805 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=22805 Log: Inform in examples/pdb about the location of the external support for the SQL backends. Modified: branches/SAMBA_3_0/examples/pdb/README branches/SAMBA_3_0_25/examples/pdb/README Changeset: Modified: branches/SAMBA_3_0/examples/pdb/README === --- branches/SAMBA_3_0/examples/pdb/README 2007-05-11 19:10:34 UTC (rev 22804) +++ branches/SAMBA_3_0/examples/pdb/README 2007-05-11 20:42:51 UTC (rev 22805) @@ -14,3 +14,7 @@ New passdb plugins should go into the samba lib directory, (/usr/lib/samba/pdb/ for most distributions). An example would be: /usr/lib/samba/pdb/test.so + +Be aware that the SQL and XML based passdb modules have been removed since the +3.0.23 release. More information of external support for SQL passdb modules +can be found at http://pdbsql.sourceforge.net/. Modified: branches/SAMBA_3_0_25/examples/pdb/README === --- branches/SAMBA_3_0_25/examples/pdb/README 2007-05-11 19:10:34 UTC (rev 22804) +++ branches/SAMBA_3_0_25/examples/pdb/README 2007-05-11 20:42:51 UTC (rev 22805) @@ -14,3 +14,7 @@ New passdb plugins should go into the samba lib directory, (/usr/lib/samba/pdb/ for most distributions). An example would be: /usr/lib/samba/pdb/test.so + +Be aware that the SQL and XML based passdb modules have been removed since the +3.0.23 release. More information of external support for SQL passdb modules +can be found at http://pdbsql.sourceforge.net/.
svn commit: samba r22806 - in branches/SAMBA_3_0_25: .
Author: lmuelle Date: 2007-05-11 20:48:45 + (Fri, 11 May 2007) New Revision: 22806 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=22806 Log: Inform that smbd gets back in a working state even if multiple passdb backends are configured. Even it only the first one is working. Modified: branches/SAMBA_3_0_25/WHATSNEW.txt Changeset: Modified: branches/SAMBA_3_0_25/WHATSNEW.txt === --- branches/SAMBA_3_0_25/WHATSNEW.txt 2007-05-11 20:42:51 UTC (rev 22805) +++ branches/SAMBA_3_0_25/WHATSNEW.txt 2007-05-11 20:48:45 UTC (rev 22806) @@ -374,7 +374,7 @@ * AIX quota fixes. -o Lars Mueller [EMAIL PROTECTED] +o Lars Mueller [EMAIL PROTECTED] * Merge more proto_exists dependency fixes from SAMBA_3_0. * Makefile cleanups. @@ -533,7 +533,7 @@ * Compiler warning fixes. -o Lars Mueller [EMAIL PROTECTED] +o Lars Mueller [EMAIL PROTECTED] * Fix make install to include smbmount, et. al. docs. @@ -784,9 +784,9 @@ * Work on NFSv4 ACL VFS plugin. -o Lars Mueller [EMAIL PROTECTED] +o Lars Mueller [EMAIL PROTECTED] * Provide better feedback about deprecated use of multiple passdb - backends. + backends. Use the first backend to have at least this one working. o James Peach [EMAIL PROTECTED]
svn commit: samba r22318 - in branches: SAMBA_3_0/source/lib SAMBA_3_0_25/source/lib
Author: lmuelle
Date: 2007-04-17 17:17:19 + (Tue, 17 Apr 2007)
New Revision: 22318
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=22318
Log:
If we're running as non root we might not be able to dump the core file
to the corepath.
Even the chdir() will fail if the LOGFILEBASE path is set 0700.
If the currrent user doesn't have the permission to create the core file
we end with:
unable to change to LOGFILEBASE
refusing to dump core
The alternative would be to change the permissions of the directory.
But taht would not ensure core dumps are working out of the box.
Modified:
branches/SAMBA_3_0/source/lib/fault.c
branches/SAMBA_3_0_25/source/lib/fault.c
Changeset:
Modified: branches/SAMBA_3_0/source/lib/fault.c
===
--- branches/SAMBA_3_0/source/lib/fault.c 2007-04-17 17:07:14 UTC (rev
22317)
+++ branches/SAMBA_3_0/source/lib/fault.c 2007-04-17 17:17:19 UTC (rev
22318)
@@ -161,6 +161,13 @@
}
#if DUMP_CORE
+ /* If we're running as non root we might not be able to dump the core
+* file to the corepath. There must not be an unbecome_root() before
+* we call abort(). */
+ if (getuid() != 0) {
+ become_root();
+ }
+
if (*corepath != '\0') {
/* The chdir might fail if we dump core before we finish
* processing the config file.
Modified: branches/SAMBA_3_0_25/source/lib/fault.c
===
--- branches/SAMBA_3_0_25/source/lib/fault.c2007-04-17 17:07:14 UTC (rev
22317)
+++ branches/SAMBA_3_0_25/source/lib/fault.c2007-04-17 17:17:19 UTC (rev
22318)
@@ -161,6 +161,13 @@
}
#if DUMP_CORE
+ /* If we're running as non root we might not be able to dump the core
+* file to the corepath. There must not be an unbecome_root() before
+* we call abort(). */
+ if (getuid() != 0) {
+ become_root();
+ }
+
if (*corepath != '\0') {
/* The chdir might fail if we dump core before we finish
* processing the config file.
svn commit: samba r22320 - in branches: SAMBA_3_0/source/lib SAMBA_3_0_25/source/lib
Author: lmuelle
Date: 2007-04-17 18:35:10 + (Tue, 17 Apr 2007)
New Revision: 22320
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=22320
Log:
Be more careful and check for the euid instead of the uid.
Thx for the hint James!
Modified:
branches/SAMBA_3_0/source/lib/fault.c
branches/SAMBA_3_0_25/source/lib/fault.c
Changeset:
Modified: branches/SAMBA_3_0/source/lib/fault.c
===
--- branches/SAMBA_3_0/source/lib/fault.c 2007-04-17 17:24:02 UTC (rev
22319)
+++ branches/SAMBA_3_0/source/lib/fault.c 2007-04-17 18:35:10 UTC (rev
22320)
@@ -164,7 +164,7 @@
/* If we're running as non root we might not be able to dump the core
* file to the corepath. There must not be an unbecome_root() before
* we call abort(). */
- if (getuid() != 0) {
+ if (geteuid() != 0) {
become_root();
}
Modified: branches/SAMBA_3_0_25/source/lib/fault.c
===
--- branches/SAMBA_3_0_25/source/lib/fault.c2007-04-17 17:24:02 UTC (rev
22319)
+++ branches/SAMBA_3_0_25/source/lib/fault.c2007-04-17 18:35:10 UTC (rev
22320)
@@ -164,7 +164,7 @@
/* If we're running as non root we might not be able to dump the core
* file to the corepath. There must not be an unbecome_root() before
* we call abort(). */
- if (getuid() != 0) {
+ if (geteuid() != 0) {
become_root();
}
svn commit: samba r22099 - in branches/SAMBA_3_0/source: .
Author: lmuelle Date: 2007-04-06 15:39:34 + (Fri, 06 Apr 2007) New Revision: 22099 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=22099 Log: Revert parts of revision 22056 as proto_exists is not required by @WINBIND_NSS@, bin/[EMAIL PROTECTED]@, and bin/[EMAIL PROTECTED]@. Modified: branches/SAMBA_3_0/source/Makefile.in Changeset: Modified: branches/SAMBA_3_0/source/Makefile.in === --- branches/SAMBA_3_0/source/Makefile.in 2007-04-06 04:43:54 UTC (rev 22098) +++ branches/SAMBA_3_0/source/Makefile.in 2007-04-06 15:39:34 UTC (rev 22099) @@ -1383,7 +1383,7 @@ @$(CC) $(FLAGS) -o $@ $(WINBINDD_OBJ) $(LDFLAGS) $(DYNEXP) $(LIBS) \ @POPTLIBS@ $(KRB5LIBS) $(LDAP_LIBS) $(PASSDB_LIBS) [EMAIL PROTECTED]@: proto_exists $(WINBIND_NSS_OBJ) [EMAIL PROTECTED]@: $(WINBIND_NSS_OBJ) @echo Linking $@ @$(SHLD) $(WINBIND_NSS_LDSHFLAGS) -o $@ $(WINBIND_NSS_OBJ) \ @WINBIND_NSS_EXTRA_LIBS@ @[EMAIL PROTECTED] [EMAIL PROTECTED]@NSSSONAMEVERSIONSUFFIX@ @@ -1400,7 +1400,7 @@ $(LDAP_LIBS) $(LIBS) -lcom_err \ @[EMAIL PROTECTED] [EMAIL PROTECTED] -bin/[EMAIL PROTECTED]@: proto_exists $(PAM_WINBIND_OBJ) bin/.dummy +bin/[EMAIL PROTECTED]@: $(PAM_WINBIND_OBJ) bin/.dummy @echo Linking shared library $@ @$(SHLD) $(LDSHFLAGS) -o $@ $(PAM_WINBIND_OBJ) -lpam @INIPARSERLIBS@ $(GPLIBS) \ @[EMAIL PROTECTED] [EMAIL PROTECTED] @@ -1623,7 +1623,7 @@ $(PARAM_OBJ) $(LIB_NONSMBD_OBJ) $(LIBS) \ @POPTLIBS@ $(KRB5LIBS) $(LDAP_LIBS) $(NSCD_LIBS) -bin/[EMAIL PROTECTED]@: proto_exists $(PAM_SMBPASS_OBJ) +bin/[EMAIL PROTECTED]@: $(PAM_SMBPASS_OBJ) @echo Linking shared library $@ @$(SHLD) $(LDSHFLAGS) -o $@ $(PAM_SMBPASS_OBJ) -lpam $(DYNEXP) $(LIBS) $(LDAP_LIBS) $(KRB5LIBS) $(NSCD_LIBS)
svn commit: samba r22100 - in branches/SAMBA_3_0_25/source: .
Author: lmuelle Date: 2007-04-06 15:49:53 + (Fri, 06 Apr 2007) New Revision: 22100 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=22100 Log: Merge proto_exists changes from revisions 21552, 21804, 22056, and 22099. Modified: branches/SAMBA_3_0_25/source/ branches/SAMBA_3_0_25/source/Makefile.in Changeset: Sorry, the patch is too large (752 lines) to include; please use WebSVN to see it! WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=22100
svn commit: samba r22102 - in branches: SAMBA_3_0/source SAMBA_3_0_25/source
Author: lmuelle
Date: 2007-04-06 16:27:28 + (Fri, 06 Apr 2007)
New Revision: 22102
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=22102
Log:
Remove obsoleted SHLIBS_PROGS from {Makefile,configure}.in.
As NSS_MODULES is added to the all rule the resulting set of binaries
are the same.
Modified:
branches/SAMBA_3_0/source/Makefile.in
branches/SAMBA_3_0/source/configure.in
branches/SAMBA_3_0_25/source/Makefile.in
branches/SAMBA_3_0_25/source/configure.in
Changeset:
Modified: branches/SAMBA_3_0/source/Makefile.in
===
--- branches/SAMBA_3_0/source/Makefile.in 2007-04-06 16:23:55 UTC (rev
22101)
+++ branches/SAMBA_3_0/source/Makefile.in 2007-04-06 16:27:28 UTC (rev
22102)
@@ -172,7 +172,7 @@
bin/[EMAIL PROTECTED]@ bin/[EMAIL PROTECTED]@ \
bin/[EMAIL PROTECTED]@ bin/[EMAIL PROTECTED]@ bin/[EMAIL PROTECTED]@
-SHLIBS = @SHLIB_PROGS@ @LIBSMBCLIENT@ @LIBSMBSHAREMODES@ @LIBMSRPC@ @LIBADDNS@
+SHLIBS = @LIBSMBCLIENT@ @LIBSMBSHAREMODES@ @LIBMSRPC@ @LIBADDNS@
PAM_MODULES = @PAM_MODULES@
@@ -888,7 +888,7 @@
# now the rules...
##
all : SHOWFLAGS $(SBIN_PROGS) $(BIN_PROGS) $(ROOT_SBIN_PROGS) \
- $(SHLIBS) $(MODULES) $(PAM_MODULES) @EXTRA_ALL_TARGETS@
+ $(SHLIBS) $(MODULES) $(NSS_MODULES) $(PAM_MODULES) @EXTRA_ALL_TARGETS@
nss_modules : $(NSS_MODULES)
Modified: branches/SAMBA_3_0/source/configure.in
===
--- branches/SAMBA_3_0/source/configure.in 2007-04-06 16:23:55 UTC (rev
22101)
+++ branches/SAMBA_3_0/source/configure.in 2007-04-06 16:27:28 UTC (rev
22102)
@@ -294,7 +294,6 @@
AC_SUBST(KRB5_LIBS)
AC_SUBST(UUID_LIBS)
AC_SUBST(LDAP_LIBS)
-AC_SUBST(SHLIB_PROGS)
AC_SUBST(PAM_MODULES)
AC_SUBST(INSTALL_PAM_MODULES)
AC_SUBST(UNINSTALL_PAM_MODULES)
@@ -5798,14 +5797,10 @@
EXTRA_BIN_PROGS=$EXTRA_BIN_PROGS bin/wbinfo\$(EXEEXT)
EXTRA_SBIN_PROGS=$EXTRA_SBIN_PROGS bin/winbindd\$(EXEEXT)
-if test $BLDSHARED = true; then
- SHLIB_PROGS=$SHLIB_PROGS $WINBIND_NSS $WINBIND_WINS_NSS
-
- if test x$create_pam_modules = xyes; then
- PAM_MODULES=$PAM_MODULES pam_winbind
- INSTALL_PAM_MODULES=installpammodules
- UNINSTALL_PAM_MODULES=uninstallpammodules
- fi
+if test $BLDSHARED = true -a x$create_pam_modules = xyes; then
+ PAM_MODULES=$PAM_MODULES pam_winbind
+ INSTALL_PAM_MODULES=installpammodules
+ UNINSTALL_PAM_MODULES=uninstallpammodules
fi
else
AC_MSG_RESULT(no$winbind_no_reason)
Modified: branches/SAMBA_3_0_25/source/Makefile.in
===
--- branches/SAMBA_3_0_25/source/Makefile.in2007-04-06 16:23:55 UTC (rev
22101)
+++ branches/SAMBA_3_0_25/source/Makefile.in2007-04-06 16:27:28 UTC (rev
22102)
@@ -168,7 +168,7 @@
bin/[EMAIL PROTECTED]@ bin/[EMAIL PROTECTED]@ \
bin/[EMAIL PROTECTED]@ bin/[EMAIL PROTECTED]@
-SHLIBS = @SHLIB_PROGS@ @LIBSMBCLIENT@ @LIBSMBSHAREMODES@ @LIBMSRPC@ @LIBADDNS@
+SHLIBS = @LIBSMBCLIENT@ @LIBSMBSHAREMODES@ @LIBMSRPC@ @LIBADDNS@
PAM_MODULES = @PAM_MODULES@
@@ -825,7 +825,7 @@
# now the rules...
##
all : SHOWFLAGS $(SBIN_PROGS) $(BIN_PROGS) $(ROOT_SBIN_PROGS) \
- $(SHLIBS) $(MODULES) $(PAM_MODULES) @EXTRA_ALL_TARGETS@
+ $(SHLIBS) $(MODULES) $(NSS_MODULES) $(PAM_MODULES) @EXTRA_ALL_TARGETS@
nss_modules : $(NSS_MODULES)
Modified: branches/SAMBA_3_0_25/source/configure.in
===
--- branches/SAMBA_3_0_25/source/configure.in 2007-04-06 16:23:55 UTC (rev
22101)
+++ branches/SAMBA_3_0_25/source/configure.in 2007-04-06 16:27:28 UTC (rev
22102)
@@ -294,7 +294,6 @@
AC_SUBST(KRB5_LIBS)
AC_SUBST(UUID_LIBS)
AC_SUBST(LDAP_LIBS)
-AC_SUBST(SHLIB_PROGS)
AC_SUBST(PAM_MODULES)
AC_SUBST(INSTALL_PAM_MODULES)
AC_SUBST(UNINSTALL_PAM_MODULES)
@@ -5763,14 +5762,10 @@
EXTRA_BIN_PROGS=$EXTRA_BIN_PROGS bin/wbinfo\$(EXEEXT)
EXTRA_SBIN_PROGS=$EXTRA_SBIN_PROGS bin/winbindd\$(EXEEXT)
-if test $BLDSHARED = true; then
- SHLIB_PROGS=$SHLIB_PROGS $WINBIND_NSS $WINBIND_WINS_NSS
-
- if test x$create_pam_modules = xyes; then
- PAM_MODULES=$PAM_MODULES pam_winbind
- INSTALL_PAM_MODULES=installpammodules
- UNINSTALL_PAM_MODULES=uninstallpammodules
- fi
+if test $BLDSHARED = true -a x$create_pam_modules = xyes; then
+ PAM_MODULES=$PAM_MODULES pam_winbind
+ INSTALL_PAM_MODULES=installpammodules
+ UNINSTALL_PAM_MODULES
svn commit: samba r22103 - in branches: SAMBA_3_0/source SAMBA_3_0_25/source
Author: lmuelle Date: 2007-04-06 16:42:37 + (Fri, 06 Apr 2007) New Revision: 22103 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=22103 Log: No code change. This is a spring time end of line clesnup checkin. Modified: branches/SAMBA_3_0/source/Makefile.in branches/SAMBA_3_0/source/configure.in branches/SAMBA_3_0_25/source/Makefile.in branches/SAMBA_3_0_25/source/configure.in Changeset: Sorry, the patch is too large (2048 lines) to include; please use WebSVN to see it! WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=22103
svn commit: samba r21816 - in branches/SAMBA_3_0_25/source: .
Author: lmuelle Date: 2007-03-13 07:30:26 + (Tue, 13 Mar 2007) New Revision: 21816 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=21816 Log: Merge missing hunks of rev 20663, 20664, 20666, and 20668 to install smbmount, smbmnt, smbumount, and the man pages only if configure was called --with-smbmount. Modified: branches/SAMBA_3_0_25/source/Makefile.in branches/SAMBA_3_0_25/source/configure.in Changeset: Modified: branches/SAMBA_3_0_25/source/Makefile.in === --- branches/SAMBA_3_0_25/source/Makefile.in2007-03-13 05:10:31 UTC (rev 21815) +++ branches/SAMBA_3_0_25/source/Makefile.in2007-03-13 07:30:26 UTC (rev 21816) @@ -159,7 +159,8 @@ bin/[EMAIL PROTECTED]@ bin/[EMAIL PROTECTED]@ bin/[EMAIL PROTECTED]@ \ bin/[EMAIL PROTECTED]@ bin/[EMAIL PROTECTED]@ bin/[EMAIL PROTECTED]@ -BIN_PROGS = $(BIN_PROGS1) $(BIN_PROGS2) $(BIN_PROGS3) @EXTRA_BIN_PROGS@ +BIN_PROGS = $(BIN_PROGS1) $(BIN_PROGS2) $(BIN_PROGS3) @EXTRA_BIN_PROGS@ \ + @SMBMOUNT_PROGS@ EVERYTHING_PROGS = bin/[EMAIL PROTECTED]@ bin/[EMAIL PROTECTED]@ \ bin/[EMAIL PROTECTED]@ bin/[EMAIL PROTECTED]@ \ @@ -1655,7 +1656,8 @@ @$(SHELL) $(srcdir)/script/revert.sh $(BINDIR) $(BIN_PROGS) $(SCRIPTS) installman: installdirs - @$(SHELL) $(srcdir)/script/installman.sh $(DESTDIR)$(MANDIR) $(srcdir) C @ROFF@ + @SMBMOUNT_PROGS=@SMBMOUNT_PROGS@ $(SHELL) \ + $(srcdir)/script/installman.sh $(DESTDIR)$(MANDIR) $(srcdir) C @ROFF@ .PHONY: showlayout Modified: branches/SAMBA_3_0_25/source/configure.in === --- branches/SAMBA_3_0_25/source/configure.in 2007-03-13 05:10:31 UTC (rev 21815) +++ branches/SAMBA_3_0_25/source/configure.in 2007-03-13 07:30:26 UTC (rev 21816) @@ -299,6 +299,7 @@ AC_SUBST(INSTALL_PAM_MODULES) AC_SUBST(UNINSTALL_PAM_MODULES) AC_SUBST(EXTRA_BIN_PROGS) +AC_SUBST(SMBMOUNT_PROGS) AC_SUBST(CIFSMOUNT_PROGS) AC_SUBST(INSTALL_CIFSMOUNT) AC_SUBST(UNINSTALL_CIFSMOUNT) @@ -4034,7 +4035,7 @@ *linux*) AC_MSG_RESULT(yes) AC_DEFINE(WITH_SMBMOUNT,1,[Whether to build smbmount]) - EXTRA_BIN_PROGS=$EXTRA_BIN_PROGS bin/smbmount bin/smbmnt bin/smbumount + SMBMOUNT_PROGS=bin/smbmount bin/smbmnt bin/smbumount ;; *) AC_MSG_ERROR(not on a linux system!)
svn commit: samba r21804 - in branches/SAMBA_3_0/source: .
Author: lmuelle Date: 2007-03-12 20:57:49 + (Mon, 12 Mar 2007) New Revision: 21804 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=21804 Log: Create a reference after proto_exits was called once. Else we link the binaries again with each make. Thx Volker to point my chesty at this. Modified: branches/SAMBA_3_0/source/ branches/SAMBA_3_0/source/Makefile.in Changeset: Property changes on: branches/SAMBA_3_0/source ___ Name: svn:ignore - tags *.po *.po32 .headers.stamp .inslog2 .ix* .proto.check .proto.stamp autom4te.cache autom4te-2.53.cache ID Makefile bin build config.cache config.log config.status configure.tridge cvs.log diffs dmalloc.log dmallog.log dox libtool so_locations tca.log testdir testtmp trace.out typescript* configure smbadduser .gdbinit TAGS t_dir + tags *.po *.po32 .headers.stamp .inslog2 .ix* .proto.check .proto.stamp autom4te.cache autom4te-2.53.cache ID Makefile bin build config.cache config.log config.status configure.tridge cvs.log diffs dmalloc.log dmallog.log dox libtool proto_exists so_locations tca.log testdir testtmp trace.out typescript* configure smbadduser .gdbinit TAGS t_dir Modified: branches/SAMBA_3_0/source/Makefile.in === --- branches/SAMBA_3_0/source/Makefile.in 2007-03-12 20:10:12 UTC (rev 21803) +++ branches/SAMBA_3_0/source/Makefile.in 2007-03-12 20:57:49 UTC (rev 21804) @@ -1837,7 +1837,7 @@ $(TOPFILES) $(BIN_PROGS) $(SBIN_PROGS) $(ROOT_SBIN_PROGS) \ $(MODULES) $(TORTURE_PROGS) $(LIBSMBCLIENT) $(LIBADDNS) \ $(LIBSMBSHAREMODES) $(EVERYTHING_PROGS) $(LIBMSRPC) \ - .headers.stamp */src/*.o + .headers.stamp */src/*.o proto_exists -rm -rf t_dir # Making this target will just make sure that the prototype files @@ -1847,6 +1847,7 @@ proto_exists: include/proto.h include/build_env.h \ nsswitch/winbindd_proto.h web/swat_proto.h \ client/client_proto.h utils/net_proto.h utils/ntlm_auth_proto.h smbd/build_options.c + @touch proto_exists delheaders: @echo Removing prototype headers
svn commit: samba r21552 - in branches/SAMBA_3_0/source: .
Author: lmuelle Date: 2007-02-26 23:07:54 + (Mon, 26 Feb 2007) New Revision: 21552 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=21552 Log: Ensure to check for proto_exists before linking any binary. No make proto should be required before creating any binary from now on. Remove proto_exists from the all, pam_smbpass, and pam_bindind rule. Modified: branches/SAMBA_3_0/source/Makefile.in Changeset: Sorry, the patch is too large (666 lines) to include; please use WebSVN to see it! WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=21552
svn commit: samba r21506 - in branches/SAMBA_3_0/source/param: .
Author: lmuelle
Date: 2007-02-22 17:52:23 + (Thu, 22 Feb 2007)
New Revision: 21506
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=21506
Log:
Allow old pre 3.0.22 multi passdb backend configurations to work with
post 3.0.23.
This implementation considers spaces in ldapsam configs. Such configs
are trunkated after the closing quote.
Modified:
branches/SAMBA_3_0/source/param/loadparm.c
Changeset:
Modified: branches/SAMBA_3_0/source/param/loadparm.c
===
--- branches/SAMBA_3_0/source/param/loadparm.c 2007-02-22 17:21:27 UTC (rev
21505)
+++ branches/SAMBA_3_0/source/param/loadparm.c 2007-02-22 17:52:23 UTC (rev
21506)
@@ -1821,7 +1821,49 @@
FN_GLOBAL_STRING(lp_nis_home_map_name, Globals.szNISHomeMapName)
static FN_GLOBAL_STRING(lp_announce_version, Globals.szAnnounceVersion)
FN_GLOBAL_LIST(lp_netbios_aliases, Globals.szNetbiosAliases)
-FN_GLOBAL_STRING(lp_passdb_backend, Globals.szPassdbBackend)
+/* FN_GLOBAL_STRING(lp_passdb_backend, Globals.szPassdbBackend)
+ * lp_passdb_backend() should be replace by the this macro again after
+ * some releases.
+ * */
+const char *lp_passdb_backend()
+{
+ char *delim, *quote;
+ int pos, i;
+
+ delim = strchr( Globals.szPassdbBackend, ' ');
+ /* no space at all */
+ if (delim == NULL) {
+ goto out;
+ }
+
+ quote = strchr(Globals.szPassdbBackend, '');
+ /* no quote char or non in the first part */
+ if (quote == NULL || quote delim) {
+ *delim = '\0';
+ goto warn;
+ }
+
+ quote = strchr(quote+1, '');
+ if (quote == NULL) {
+ DEBUG(0, (WARNING: Your 'passdb backend' configuration is
invalid due to a missing second \ char.\n));
+ goto out;
+ } else if (*(quote+1) == '\0') {
+ /* space, fitting quote char, and one backend only */
+ goto out;
+ } else {
+ /* terminate string after the fitting quote char */
+ *(quote+1) = '\0';
+ }
+
+warn:
+ DEBUG(0, (WARNING: Your 'passdb backend' configuration includes
multiple backends. This\n
+ is deprecated since Samba 3.0.23. Please check WHATSNEW.txt
or the section 'Passdb\n
+ Changes' from the ChangeNotes as part of the Samba HOWTO
collection. The first part\n
+ (%s) of your configuration is used instead.\n,
Globals.szPassdbBackend));
+
+out:
+ return Globals.szPassdbBackend;
+}
FN_GLOBAL_LIST(lp_preload_modules, Globals.szPreloadModules)
FN_GLOBAL_STRING(lp_panic_action, Globals.szPanicAction)
FN_GLOBAL_STRING(lp_adduser_script, Globals.szAddUserScript)
svn commit: samba r21509 - in branches: SAMBA_3_0/source/param SAMBA_3_0_25/source/param
Author: lmuelle
Date: 2007-02-22 23:12:36 + (Thu, 22 Feb 2007)
New Revision: 21509
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=21509
Log:
Merge lp_passdb_backend() from rev 21506 to 3_0_25.
Slightly change the DEBUG 0 message as suggested by Volker on
samba-technical.
Modified:
branches/SAMBA_3_0/source/param/loadparm.c
branches/SAMBA_3_0_25/source/param/loadparm.c
Changeset:
Modified: branches/SAMBA_3_0/source/param/loadparm.c
===
--- branches/SAMBA_3_0/source/param/loadparm.c 2007-02-22 21:59:54 UTC (rev
21508)
+++ branches/SAMBA_3_0/source/param/loadparm.c 2007-02-22 23:12:36 UTC (rev
21509)
@@ -1858,8 +1858,8 @@
warn:
DEBUG(0, (WARNING: Your 'passdb backend' configuration includes
multiple backends. This\n
is deprecated since Samba 3.0.23. Please check WHATSNEW.txt
or the section 'Passdb\n
- Changes' from the ChangeNotes as part of the Samba HOWTO
collection. The first part\n
- (%s) of your configuration is used instead.\n,
Globals.szPassdbBackend));
+ Changes' from the ChangeNotes as part of the Samba HOWTO
collection. Only the first\n
+ backend (%s) is used. The rest is ignored.\n,
Globals.szPassdbBackend));
out:
return Globals.szPassdbBackend;
Modified: branches/SAMBA_3_0_25/source/param/loadparm.c
===
--- branches/SAMBA_3_0_25/source/param/loadparm.c 2007-02-22 21:59:54 UTC
(rev 21508)
+++ branches/SAMBA_3_0_25/source/param/loadparm.c 2007-02-22 23:12:36 UTC
(rev 21509)
@@ -1820,7 +1820,49 @@
FN_GLOBAL_STRING(lp_nis_home_map_name, Globals.szNISHomeMapName)
static FN_GLOBAL_STRING(lp_announce_version, Globals.szAnnounceVersion)
FN_GLOBAL_LIST(lp_netbios_aliases, Globals.szNetbiosAliases)
-FN_GLOBAL_STRING(lp_passdb_backend, Globals.szPassdbBackend)
+/* FN_GLOBAL_STRING(lp_passdb_backend, Globals.szPassdbBackend)
+ * lp_passdb_backend() should be replace by the this macro again after
+ * some releases.
+ * */
+const char *lp_passdb_backend()
+{
+ char *delim, *quote;
+ int pos, i;
+
+ delim = strchr( Globals.szPassdbBackend, ' ');
+ /* no space at all */
+ if (delim == NULL) {
+ goto out;
+ }
+
+ quote = strchr(Globals.szPassdbBackend, '');
+ /* no quote char or non in the first part */
+ if (quote == NULL || quote delim) {
+ *delim = '\0';
+ goto warn;
+ }
+
+ quote = strchr(quote+1, '');
+ if (quote == NULL) {
+ DEBUG(0, (WARNING: Your 'passdb backend' configuration is
invalid due to a missing second \ char.\n));
+ goto out;
+ } else if (*(quote+1) == '\0') {
+ /* space, fitting quote char, and one backend only */
+ goto out;
+ } else {
+ /* terminate string after the fitting quote char */
+ *(quote+1) = '\0';
+ }
+
+warn:
+ DEBUG(0, (WARNING: Your 'passdb backend' configuration includes
multiple backends. This\n
+ is deprecated since Samba 3.0.23. Please check WHATSNEW.txt
or the section 'Passdb\n
+ Changes' from the ChangeNotes as part of the Samba HOWTO
collection. Only the first\n
+ backend (%s) is used. The rest is ignored.\n,
Globals.szPassdbBackend));
+
+out:
+ return Globals.szPassdbBackend;
+}
FN_GLOBAL_LIST(lp_preload_modules, Globals.szPreloadModules)
FN_GLOBAL_STRING(lp_panic_action, Globals.szPanicAction)
FN_GLOBAL_STRING(lp_adduser_script, Globals.szAddUserScript)
svn commit: samba r20663 - in branches/SAMBA_3_0/source: . script
Author: lmuelle
Date: 2007-01-10 19:16:59 + (Wed, 10 Jan 2007)
New Revision: 20663
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=20663
Log:
Do not install smbmount man page if we didn't called configure
--with-smbmount.
Modified:
branches/SAMBA_3_0/source/Makefile.in
branches/SAMBA_3_0/source/configure.in
branches/SAMBA_3_0/source/script/installman.sh
Changeset:
Modified: branches/SAMBA_3_0/source/Makefile.in
===
--- branches/SAMBA_3_0/source/Makefile.in 2007-01-10 18:52:16 UTC (rev
20662)
+++ branches/SAMBA_3_0/source/Makefile.in 2007-01-10 19:16:59 UTC (rev
20663)
@@ -163,7 +163,7 @@
bin/[EMAIL PROTECTED]@ bin/[EMAIL PROTECTED]@ bin/[EMAIL PROTECTED]@ \
bin/[EMAIL PROTECTED]@ bin/[EMAIL PROTECTED]@ bin/[EMAIL PROTECTED]@
-BIN_PROGS = $(BIN_PROGS1) $(BIN_PROGS2) $(BIN_PROGS3) $(BIN_PROGS4)
@EXTRA_BIN_PROGS@
+BIN_PROGS = $(BIN_PROGS1) $(BIN_PROGS2) $(BIN_PROGS3) $(BIN_PROGS4)
@EXTRA_BIN_PROGS@ @SMBMOUNT_PROGS@
EVERYTHING_PROGS = bin/[EMAIL PROTECTED]@ bin/[EMAIL PROTECTED]@ \
bin/[EMAIL PROTECTED]@ bin/[EMAIL PROTECTED]@ \
@@ -1714,7 +1714,8 @@
@$(SHELL) $(srcdir)/script/revert.sh $(BINDIR) $(BIN_PROGS) $(SCRIPTS)
installman: installdirs
- @$(SHELL) $(srcdir)/script/installman.sh $(DESTDIR)$(MANDIR) $(srcdir)
C @ROFF@
+ @$(SHELL) SMBMOUNT_PROGS=@SMBMOUNT_PROGS@ \
+ $(srcdir)/script/installman.sh $(DESTDIR)$(MANDIR) $(srcdir) C
@ROFF@
.PHONY: showlayout
Modified: branches/SAMBA_3_0/source/configure.in
===
--- branches/SAMBA_3_0/source/configure.in 2007-01-10 18:52:16 UTC (rev
20662)
+++ branches/SAMBA_3_0/source/configure.in 2007-01-10 19:16:59 UTC (rev
20663)
@@ -302,6 +302,7 @@
AC_SUBST(SMBWRAP_OBJS)
AC_SUBST(SMBWRAP_INC)
AC_SUBST(EXTRA_BIN_PROGS)
+AC_SUBST(SMBMOUNT_PROGS)
AC_SUBST(CIFSMOUNT_PROGS)
AC_SUBST(INSTALL_CIFSMOUNT)
AC_SUBST(UNINSTALL_CIFSMOUNT)
@@ -4016,7 +4017,7 @@
*linux*)
AC_MSG_RESULT(yes)
AC_DEFINE(WITH_SMBMOUNT,1,[Whether to build smbmount])
- EXTRA_BIN_PROGS=$EXTRA_BIN_PROGS bin/smbmount bin/smbmnt
bin/smbumount
+ SMBMOUNT_PROGS=bin/smbmount bin/smbmnt bin/smbumount
;;
*)
AC_MSG_ERROR(not on a linux system!)
Modified: branches/SAMBA_3_0/source/script/installman.sh
===
--- branches/SAMBA_3_0/source/script/installman.sh 2007-01-10 18:52:16 UTC
(rev 20662)
+++ branches/SAMBA_3_0/source/script/installman.sh 2007-01-10 19:16:59 UTC
(rev 20663)
@@ -49,6 +49,7 @@
# Check if this man page if required by the configured feature set
case ${MP_BASENAME} in
smbsh.1) test -z ${SMBWRAPPER} continue ;;
+ smbmount.8) test -z ${SMBMOUNT_PROGS} continue ;;
*) ;;
esac
svn commit: samba r20664 - in branches/SAMBA_3_0/source: .
Author: lmuelle Date: 2007-01-10 19:54:49 + (Wed, 10 Jan 2007) New Revision: 20664 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=20664 Log: Set the environment variable _before_ calling the shell. Modified: branches/SAMBA_3_0/source/Makefile.in Changeset: Modified: branches/SAMBA_3_0/source/Makefile.in === --- branches/SAMBA_3_0/source/Makefile.in 2007-01-10 19:16:59 UTC (rev 20663) +++ branches/SAMBA_3_0/source/Makefile.in 2007-01-10 19:54:49 UTC (rev 20664) @@ -1714,7 +1714,7 @@ @$(SHELL) $(srcdir)/script/revert.sh $(BINDIR) $(BIN_PROGS) $(SCRIPTS) installman: installdirs - @$(SHELL) SMBMOUNT_PROGS=@SMBMOUNT_PROGS@ \ + @SMBMOUNT_PROGS=@SMBMOUNT_PROGS@ $(SHELL) \ $(srcdir)/script/installman.sh $(DESTDIR)$(MANDIR) $(srcdir) C @ROFF@ .PHONY: showlayout
svn commit: samba r20666 - in branches/SAMBA_3_0/source/script: .
Author: lmuelle
Date: 2007-01-10 20:08:25 + (Wed, 10 Jan 2007)
New Revision: 20666
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=20666
Log:
Also do not install the smbmnt man page if SMBMOUNT_PROGS is not set.
Modified:
branches/SAMBA_3_0/source/script/installman.sh
Changeset:
Modified: branches/SAMBA_3_0/source/script/installman.sh
===
--- branches/SAMBA_3_0/source/script/installman.sh 2007-01-10 20:07:13 UTC
(rev 20665)
+++ branches/SAMBA_3_0/source/script/installman.sh 2007-01-10 20:08:25 UTC
(rev 20666)
@@ -49,7 +49,7 @@
# Check if this man page if required by the configured feature set
case ${MP_BASENAME} in
smbsh.1) test -z ${SMBWRAPPER} continue ;;
- smbmount.8) test -z ${SMBMOUNT_PROGS} continue ;;
+ smbmnt.8|smbmount.8) test -z ${SMBMOUNT_PROGS} continue ;;
*) ;;
esac
svn commit: samba r20668 - in branches/SAMBA_3_0/source/script: .
Author: lmuelle
Date: 2007-01-10 21:46:39 + (Wed, 10 Jan 2007)
New Revision: 20668
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=20668
Log:
Also do not install the smbumount man page if we don't build smbumount.
Modified:
branches/SAMBA_3_0/source/script/installman.sh
Changeset:
Modified: branches/SAMBA_3_0/source/script/installman.sh
===
--- branches/SAMBA_3_0/source/script/installman.sh 2007-01-10 20:11:59 UTC
(rev 20667)
+++ branches/SAMBA_3_0/source/script/installman.sh 2007-01-10 21:46:39 UTC
(rev 20668)
@@ -49,7 +49,7 @@
# Check if this man page if required by the configured feature set
case ${MP_BASENAME} in
smbsh.1) test -z ${SMBWRAPPER} continue ;;
- smbmnt.8|smbmount.8) test -z ${SMBMOUNT_PROGS} continue ;;
+ smbmnt.8|smbmount.8|smbumount.8) test -z ${SMBMOUNT_PROGS}
continue ;;
*) ;;
esac
svn commit: samba r19747 - in branches/SAMBA_3_0/source: .
Author: lmuelle Date: 2006-11-16 18:16:57 + (Thu, 16 Nov 2006) New Revision: 19747 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=19747 Log: Ensure to link with the required objects. Modified: branches/SAMBA_3_0/source/Makefile.in Changeset: Modified: branches/SAMBA_3_0/source/Makefile.in === --- branches/SAMBA_3_0/source/Makefile.in 2006-11-16 17:57:01 UTC (rev 19746) +++ branches/SAMBA_3_0/source/Makefile.in 2006-11-16 18:16:57 UTC (rev 19747) @@ -1551,7 +1551,7 @@ bin/[EMAIL PROTECTED]@: $(PAM_SMBPASS_OBJ) @echo Linking shared library $@ - @$(SHLD) $(LDSHFLAGS) -o $@ $(PAM_SMBPASS_OBJ) -lpam $(DYNEXP) $(LIBS) $(LDAP_LIBS) $(KRB5LIBS) + @$(SHLD) $(LDSHFLAGS) -o $@ $(PAM_SMBPASS_OBJ) -lpam $(DYNEXP) $(LIBS) $(LDAP_LIBS) $(KRB5LIBS) $(NSCD_LIBS) bin/[EMAIL PROTECTED]@: $(TDBBACKUP_OBJ) bin/.dummy @echo Linking $@
svn commit: samba r19748 - in branches/SAMBA_3_0/source: .
Author: lmuelle Date: 2006-11-16 18:29:36 + (Thu, 16 Nov 2006) New Revision: 19748 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=19748 Log: Ensure to link against the required libraries. Modified: branches/SAMBA_3_0/source/Makefile.in Changeset: Modified: branches/SAMBA_3_0/source/Makefile.in === --- branches/SAMBA_3_0/source/Makefile.in 2006-11-16 18:16:57 UTC (rev 19747) +++ branches/SAMBA_3_0/source/Makefile.in 2006-11-16 18:29:36 UTC (rev 19748) @@ -1202,7 +1202,7 @@ bin/[EMAIL PROTECTED]@: $(LIBSMBCLIENT_OBJ) @echo Linking libsmbclient shared library $@ @$(SHLD) $(LDSHFLAGS) -o $@ $(LIBSMBCLIENT_OBJ) $(LDFLAGS) $(LIBS) \ - $(KRB5LIBS) $(LDAP_LIBS) \ + $(KRB5LIBS) $(LDAP_LIBS) $(NSCD_LIBS) \ @[EMAIL PROTECTED] [EMAIL PROTECTED](LIBSMBCLIENT_MAJOR) bin/libsmbclient.a: $(LIBSMBCLIENT_OBJ)
svn commit: lorikeet r681 - in trunk/mod_auth_ntlm_winbind: .
Author: lmuelle
Date: 2006-11-15 10:53:45 + (Wed, 15 Nov 2006)
New Revision: 681
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=lorikeetrev=681
Log:
Add tarball rule.
Add VERSION file.
Added:
trunk/mod_auth_ntlm_winbind/VERSION
Modified:
trunk/mod_auth_ntlm_winbind/Makefile.in
Changeset:
Modified: trunk/mod_auth_ntlm_winbind/Makefile.in
===
--- trunk/mod_auth_ntlm_winbind/Makefile.in 2006-11-14 23:28:53 UTC (rev
680)
+++ trunk/mod_auth_ntlm_winbind/Makefile.in 2006-11-15 10:53:45 UTC (rev
681)
@@ -18,6 +18,44 @@
install: $(SODIR)mod_auth_ntlm_winbind.so
$(APXS) $(APXS_FLAGS) -S LIBEXECDIR=$(APXSLIBDIR) -n auth_ntlm_winbind
-i $(SODIR)mod_auth_ntlm_winbind.so
+tarball: distclean
+ @case $${RELEASE} in \
+ 1|y|Y|yes|Yes) ;; \
+ *) \
+ TMPDIR=$$( mktemp -d __SVN_VERSION.); \
+ if test $$? -ne 0; then \
+ echo Can't create temp dir to store svn
version. ; \
+ exit 1; \
+ fi; \
+ mv VERSION $${TMPDIR}/; \
+ cp -p $${TMPDIR}/VERSION .; \
+ echo MOD_AUTH_NTLM_WINBIND_SVNVERSION=\$$(
svnversion)\ \
+ VERSION; \
+ ;; \
+ esac; \
+ . VERSION; \
+
TARBALL_VERSION=$${MOD_AUTH_NTLM_WINBIND_VERSION}$${MOD_AUTH_NTLM_WINBIND_SVNVERSION:+.$${MOD_AUTH_NTLM_WINBIND_SVNVERSION}};
\
+ TARBALL_BASENAME=mod_auth_ntlm_winbind-$${TARBALL_VERSION}; \
+ echo Creating ../$${TARBALL_BASENAME}.tar.bz2 ; \
+ pushd .. /dev/null; \
+ if ! test -e $${TARBALL_BASENAME}; then \
+ TARBALL_SYMLINK_CREATED=yes; \
+ ln -s mod_auth_ntlm_winbind $${TARBALL_BASENAME}; \
+ fi; \
+ tar cfhj $${TARBALL_BASENAME}.tar.bz2 \
+ --exclude=__SVN_VERSION. \
+ --exclude=.*.swp \
+ --exclude=.svn \
+ $${TARBALL_BASENAME}; \
+ test $${TARBALL_SYMLINK_CREATED} = yes \
+ rm $${TARBALL_BASENAME}; \
+ popd /dev/null; \
+ if test -d $$TMPDIR; then \
+ test -f $${TMPDIR}/VERSION \
+ mv $${TMPDIR}/VERSION .; \
+ rmdir $${TMPDIR}; \
+ fi
+
# Clean targets
clean:
rm -f *~ $(MOD_NTLM_WINBIND_SRC:.c=.{la,lo,o,slo})
Added: trunk/mod_auth_ntlm_winbind/VERSION
===
--- trunk/mod_auth_ntlm_winbind/VERSION 2006-11-14 23:28:53 UTC (rev 680)
+++ trunk/mod_auth_ntlm_winbind/VERSION 2006-11-15 10:53:45 UTC (rev 681)
@@ -0,0 +1 @@
+MOD_AUTH_NTLM_WINBIND_VERSION=0.0.0
svn commit: lorikeet r682 - in trunk/mod_auth_ntlm_winbind: .
Author: lmuelle
Date: 2006-11-15 10:57:17 + (Wed, 15 Nov 2006)
New Revision: 682
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=lorikeetrev=682
Log:
Add 'lorikeet_svn_' as prefix if we do a svn snapshot tar ball.
Modified:
trunk/mod_auth_ntlm_winbind/Makefile.in
Changeset:
Modified: trunk/mod_auth_ntlm_winbind/Makefile.in
===
--- trunk/mod_auth_ntlm_winbind/Makefile.in 2006-11-15 10:53:45 UTC (rev
681)
+++ trunk/mod_auth_ntlm_winbind/Makefile.in 2006-11-15 10:57:17 UTC (rev
682)
@@ -34,7 +34,7 @@
;; \
esac; \
. VERSION; \
-
TARBALL_VERSION=$${MOD_AUTH_NTLM_WINBIND_VERSION}$${MOD_AUTH_NTLM_WINBIND_SVNVERSION:+.$${MOD_AUTH_NTLM_WINBIND_SVNVERSION}};
\
+
TARBALL_VERSION=$${MOD_AUTH_NTLM_WINBIND_VERSION}$${MOD_AUTH_NTLM_WINBIND_SVNVERSION:+.lorikeet_svn_$${MOD_AUTH_NTLM_WINBIND_SVNVERSION}};
\
TARBALL_BASENAME=mod_auth_ntlm_winbind-$${TARBALL_VERSION}; \
echo Creating ../$${TARBALL_BASENAME}.tar.bz2 ; \
pushd .. /dev/null; \
svn commit: lorikeet r683 - in trunk/mod_auth_ntlm_winbind: .
Author: lmuelle
Date: 2006-11-15 11:57:51 + (Wed, 15 Nov 2006)
New Revision: 683
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=lorikeetrev=683
Log:
Be less verbose in the clean rules.
Modified:
trunk/mod_auth_ntlm_winbind/Makefile.in
Changeset:
Modified: trunk/mod_auth_ntlm_winbind/Makefile.in
===
--- trunk/mod_auth_ntlm_winbind/Makefile.in 2006-11-15 10:57:17 UTC (rev
682)
+++ trunk/mod_auth_ntlm_winbind/Makefile.in 2006-11-15 11:57:51 UTC (rev
683)
@@ -58,13 +58,13 @@
# Clean targets
clean:
- rm -f *~ $(MOD_NTLM_WINBIND_SRC:.c=.{la,lo,o,slo})
- rm -rf $(SODIR)
+ @rm -f *~ $(MOD_NTLM_WINBIND_SRC:.c=.{la,lo,o,slo})
+ @rm -rf $(SODIR)
realclean: clean
- rm -f config.log
+ @rm -f config.log
distclean: realclean
- rm -f config.h Makefile
- rm -f config.status config.cache
- rm -rf autom4te.cache
+ @rm -f config.h Makefile \
+ config.status config.cache
+ @rm -rf autom4te.cache
svn commit: lorikeet r684 - in trunk/mod_auth_ntlm_winbind/debian: .
Author: lmuelle Date: 2006-11-15 12:48:39 + (Wed, 15 Nov 2006) New Revision: 684 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=lorikeetrev=684 Log: Switch ntlm and auth. Modified: trunk/mod_auth_ntlm_winbind/debian/auth_ntlm_winbind.load Changeset: Modified: trunk/mod_auth_ntlm_winbind/debian/auth_ntlm_winbind.load === --- trunk/mod_auth_ntlm_winbind/debian/auth_ntlm_winbind.load 2006-11-15 11:57:51 UTC (rev 683) +++ trunk/mod_auth_ntlm_winbind/debian/auth_ntlm_winbind.load 2006-11-15 12:48:39 UTC (rev 684) @@ -1 +1 @@ -LoadModule ntlm_auth_winbind_module /usr/lib/apache2/modules/mod_auth_ntlm_winbind.so +LoadModule auth_ntlm_winbind_module /usr/lib/apache2/modules/mod_auth_ntlm_winbind.so
svn commit: lorikeet r685 - in trunk/mod_auth_ntlm_winbind: .
Author: lmuelle Date: 2006-11-15 12:49:02 + (Wed, 15 Nov 2006) New Revision: 685 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=lorikeetrev=685 Log: Add missing auth_ prefix. Modified: trunk/mod_auth_ntlm_winbind/500mod_auth_ntlm_winbind.info Changeset: Modified: trunk/mod_auth_ntlm_winbind/500mod_auth_ntlm_winbind.info === --- trunk/mod_auth_ntlm_winbind/500mod_auth_ntlm_winbind.info 2006-11-15 12:48:39 UTC (rev 684) +++ trunk/mod_auth_ntlm_winbind/500mod_auth_ntlm_winbind.info 2006-11-15 12:49:02 UTC (rev 685) @@ -1,4 +1,4 @@ -LoadModule: ntlm_winbind_module /usr/lib/apache/1.3/mod_auth_ntlm_winbind.so +LoadModule: auth_ntlm_winbind_module /usr/lib/apache/1.3/mod_auth_ntlm_winbind.so Directives: NTLMAuth NegotiateAuth
svn commit: lorikeet r676 - in trunk: .
Author: lmuelle Date: 2006-11-14 16:45:47 + (Tue, 14 Nov 2006) New Revision: 676 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=lorikeetrev=676 Log: Finaly rename the mod_ntlm_winbind directory to mod_auth_ntlm_winbind. Added: trunk/mod_auth_ntlm_winbind/ Removed: trunk/mod_ntlm_winbind/ Changeset: Copied: trunk/mod_auth_ntlm_winbind (from rev 675, trunk/mod_ntlm_winbind)
svn commit: lorikeet r673 - in trunk/mod_ntlm_winbind: .
Author: lmuelle
Date: 2006-11-14 15:50:40 + (Tue, 14 Nov 2006)
New Revision: 673
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=lorikeetrev=673
Log:
Rename mod_ntlm_winbind to mod_auth_ntlm_winbind even in the source code
and the README.
AP_MODULE_DECLARE_DATA or MODULE_VAR_EXPORT are now defined as
mod_auth_ntlm_winbind.
Modified:
trunk/mod_ntlm_winbind/Makefile.in
trunk/mod_ntlm_winbind/README
trunk/mod_ntlm_winbind/mod_ntlm_winbind.c
Changeset:
Modified: trunk/mod_ntlm_winbind/Makefile.in
===
--- trunk/mod_ntlm_winbind/Makefile.in 2006-11-14 04:40:45 UTC (rev 672)
+++ trunk/mod_ntlm_winbind/Makefile.in 2006-11-14 15:50:40 UTC (rev 673)
@@ -1,5 +1,5 @@
#
-# Makefile for mod_ntlm_winbind
+# Makefile for mod_auth_ntlm_winbind
#
# Programs
Modified: trunk/mod_ntlm_winbind/README
===
--- trunk/mod_ntlm_winbind/README 2006-11-14 04:40:45 UTC (rev 672)
+++ trunk/mod_ntlm_winbind/README 2006-11-14 15:50:40 UTC (rev 673)
@@ -1,5 +1,5 @@
-mod_ntlm_winbind is an Apache 1.x/2.x module that provides NTLM and
-Basic authentication via winbind.
+mod_auth_ntlm_winbind is an Apache 1.x/2.x module that provides NTLM
+and Basic authentication via winbind.
INSTALLATION:
The configure.in script and Makefile are essentially wrappers around
@@ -28,10 +28,10 @@
(substitute apxs2 as appropriate)
CONFIGURATION
-mod_ntlm_winbind uses the same ntlm_auth helper as the Squid proxy, so
-the same setup applies as for Squid: the winbindd_privileged directory
-must be accessible by the webserver userid. The configuration
-directives added by this module are as follows:
+mod_auth_ntlm_winbind uses the same ntlm_auth helper as the Squid
+proxy, so the same setup applies as for Squid: the winbindd_privileged
+directory must be accessible by the webserver userid. The
+configuration directives added by this module are as follows:
NTLMAuth
set to 'on' to activate NTLM authentication
Modified: trunk/mod_ntlm_winbind/mod_ntlm_winbind.c
===
--- trunk/mod_ntlm_winbind/mod_ntlm_winbind.c 2006-11-14 04:40:45 UTC (rev
672)
+++ trunk/mod_ntlm_winbind/mod_ntlm_winbind.c 2006-11-14 15:50:40 UTC (rev
673)
@@ -40,9 +40,9 @@
/*
* OVERVIEW:
*
- * The mod_ntlm_winbind module allows authentication and authorisation over
- * the web against a Windows NT/2000/XP domain controller using the winbind
- * daemon running on the same machine apache is running on.
+ * The mod_auth_ntlm_winbind module allows authentication and authorisation
+ * over the web against a Windows NT/2000/XP domain controller using the
+ * winbind daemon running on the same machine apache is running on.
*
* Used only by IE and newer versions of Mozilla, the NTLM over HTTP protocol
is completed undocumented
* by Microsoft but has been reverse engineered and described at the
@@ -130,7 +130,7 @@
#define NEGOTIATE_AUTH_NAME Negotiate
/* A structure to hold information about the configuration for the
- mod_ntlm_winbind apache module. */
+ mod_auth_ntlm_winbind apache module. */
typedef struct _ntlm_config_struct {
unsigned int ntlm_on;
@@ -180,9 +180,9 @@
} ntlm_context_t;
#ifdef APACHE2
-module AP_MODULE_DECLARE_DATA ntlm_winbind_module;
+module AP_MODULE_DECLARE_DATA ntlm_auth_winbind_module;
#else
-module MODULE_VAR_EXPORT ntlm_winbind_module;
+module MODULE_VAR_EXPORT ntlm_auth_winbind_module;
#endif
#define NTLM_DEBUG (APLOG_DEBUG | APLOG_NOERRNO)
@@ -340,7 +340,7 @@
#ifdef APACHE2
retval = (ntlm_connection_context_t *)ap_get_module_config(
connection-conn_config,
-
ntlm_winbind_module );
+
ntlm_auth_winbind_module );
#else
retval = global_connection_context;
#endif
@@ -355,7 +355,7 @@
{
ntlm_config_rec *crec
= (ntlm_config_rec *) ap_get_module_config(r-per_dir_config,
- ntlm_winbind_module);
+ ntlm_auth_winbind_module);
char *line;
ntlm_connection_context_t *ctxt = get_connection_context( r-connection );
@@ -987,7 +987,7 @@
static int check_user_id(request_rec * r) {
ntlm_config_rec *crec =
(ntlm_config_rec *) ap_get_module_config(r-per_dir_config,
- ntlm_winbind_module);
+ ntlm_auth_winbind_module);
ntlm_connection_context_t *ctxt = get_connection_context( r-connection );
const char *auth_line = apr_table_get(r-headers_in,
r-proxyreq ? Proxy-Authorization
@@ -1078,7 +1078,7 @@
static int ntlm_pre_conn(conn_rec *c, void *csd) {
ntlm_connection_context_t
svn commit: lorikeet r674 - in trunk/mod_ntlm_winbind: .
Author: lmuelle Date: 2006-11-14 16:06:56 + (Tue, 14 Nov 2006) New Revision: 674 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=lorikeetrev=674 Log: Next step to make the source of mod_auth_ntlm_winbind more consistend. Rename mod_ntlm_winbind.c to mod_auth_ntlm_winbind.c and use the new name in configure.in, Makefile.in, and the README. Added: trunk/mod_ntlm_winbind/mod_auth_ntlm_winbind.c Removed: trunk/mod_ntlm_winbind/mod_ntlm_winbind.c Modified: trunk/mod_ntlm_winbind/Makefile.in trunk/mod_ntlm_winbind/README trunk/mod_ntlm_winbind/configure.in Changeset: Sorry, the patch is too large (2334 lines) to include; please use WebSVN to see it! WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=lorikeetrev=674
svn commit: lorikeet r675 - in trunk/mod_ntlm_winbind: .
Author: lmuelle
Date: 2006-11-14 16:18:30 + (Tue, 14 Nov 2006)
New Revision: 675
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=lorikeetrev=675
Log:
Trim the clean targets a bit.
Ignore autom4te.cache sub dir.
Modified:
trunk/mod_ntlm_winbind/
trunk/mod_ntlm_winbind/Makefile.in
Changeset:
Property changes on: trunk/mod_ntlm_winbind
___
Name: svn:ignore
- config.guess
config.sub
build-stamp
config.log
Makefile
.libs
config.cache
config.status
*.slo
configure
*.loT
+ autom4te.cache
config.guess
config.sub
build-stamp
config.log
Makefile
.libs
config.cache
config.status
*.slo
configure
*.loT
Modified: trunk/mod_ntlm_winbind/Makefile.in
===
--- trunk/mod_ntlm_winbind/Makefile.in 2006-11-14 16:06:56 UTC (rev 674)
+++ trunk/mod_ntlm_winbind/Makefile.in 2006-11-14 16:18:30 UTC (rev 675)
@@ -20,7 +20,8 @@
# Clean targets
clean:
- rm -f *~ $(SODIR)mod_auth_ntlm_winbind.so $(MOD_NTLM_WINBIND_SRC:.c=.o)
+ rm -f *~ $(MOD_NTLM_WINBIND_SRC:.c=.{la,lo,o,slo})
+ rm -rf $(SODIR)
realclean: clean
rm -f config.log
@@ -28,3 +29,4 @@
distclean: realclean
rm -f config.h Makefile
rm -f config.status config.cache
+ rm -rf autom4te.cache
svn commit: lorikeet r677 - in trunk/mod_auth_ntlm_winbind: .
Author: lmuelle
Date: 2006-11-14 18:14:25 + (Tue, 14 Nov 2006)
New Revision: 677
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=lorikeetrev=677
Log:
Name it auth_ntlm_winbind and not ntlm_auth_winbind.
Modified:
trunk/mod_auth_ntlm_winbind/mod_auth_ntlm_winbind.c
Changeset:
Modified: trunk/mod_auth_ntlm_winbind/mod_auth_ntlm_winbind.c
===
--- trunk/mod_auth_ntlm_winbind/mod_auth_ntlm_winbind.c 2006-11-14 16:45:47 UTC
(rev 676)
+++ trunk/mod_auth_ntlm_winbind/mod_auth_ntlm_winbind.c 2006-11-14 18:14:25 UTC
(rev 677)
@@ -180,9 +180,9 @@
} ntlm_context_t;
#ifdef APACHE2
-module AP_MODULE_DECLARE_DATA ntlm_auth_winbind_module;
+module AP_MODULE_DECLARE_DATA auth_ntlm_winbind_module;
#else
-module MODULE_VAR_EXPORT ntlm_auth_winbind_module;
+module MODULE_VAR_EXPORT auth_ntlm_winbind_module;
#endif
#define NTLM_DEBUG (APLOG_DEBUG | APLOG_NOERRNO)
@@ -340,7 +340,7 @@
#ifdef APACHE2
retval = (ntlm_connection_context_t *)ap_get_module_config(
connection-conn_config,
-
ntlm_auth_winbind_module );
+
auth_ntlm_winbind_module );
#else
retval = global_connection_context;
#endif
@@ -355,7 +355,7 @@
{
ntlm_config_rec *crec
= (ntlm_config_rec *) ap_get_module_config(r-per_dir_config,
- ntlm_auth_winbind_module);
+ auth_ntlm_winbind_module);
char *line;
ntlm_connection_context_t *ctxt = get_connection_context( r-connection );
@@ -987,7 +987,7 @@
static int check_user_id(request_rec * r) {
ntlm_config_rec *crec =
(ntlm_config_rec *) ap_get_module_config(r-per_dir_config,
- ntlm_auth_winbind_module);
+ auth_ntlm_winbind_module);
ntlm_connection_context_t *ctxt = get_connection_context( r-connection );
const char *auth_line = apr_table_get(r-headers_in,
r-proxyreq ? Proxy-Authorization
@@ -1078,7 +1078,7 @@
static int ntlm_pre_conn(conn_rec *c, void *csd) {
ntlm_connection_context_t *ctxt = apr_pcalloc(c-pool,
sizeof(ntlm_connection_context_t));
-ap_set_module_config(c-conn_config, ntlm_auth_winbind_module, ctxt);
+ap_set_module_config(c-conn_config, auth_ntlm_winbind_module, ctxt);
return OK;
}
@@ -1090,7 +1090,7 @@
ap_hook_check_user_id(check_user_id,NULL,NULL,APR_HOOK_MIDDLE);
};
-module AP_MODULE_DECLARE_DATA ntlm_auth_winbind_module = {
+module AP_MODULE_DECLARE_DATA auth_ntlm_winbind_module = {
STANDARD20_MODULE_STUFF,
ntlm_winbind_dir_config, /* create per-dirconfig structures */
NULL,/* merge per-dirconfig structures */
@@ -1100,7 +1100,7 @@
register_hooks, /* register hooks */
};
#else
-module MODULE_VAR_EXPORT ntlm_auth_winbind_module = {
+module MODULE_VAR_EXPORT auth_ntlm_winbind_module = {
STANDARD_MODULE_STUFF,
NULL,/* module initializer */
ntlm_winbind_dir_config, /* create per-dirconfig structures */
svn commit: lorikeet r678 - in trunk/mod_auth_ntlm_winbind/debian: .
Author: lmuelle Date: 2006-11-14 22:18:50 + (Tue, 14 Nov 2006) New Revision: 678 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=lorikeetrev=678 Log: Use mod_auth_ntlm_winbind instead of mod_ntlm_winbind also in the debian sub directory. Modified: trunk/mod_auth_ntlm_winbind/debian/auth_ntlm_winbind.load trunk/mod_auth_ntlm_winbind/debian/copyright Changeset: Modified: trunk/mod_auth_ntlm_winbind/debian/auth_ntlm_winbind.load === --- trunk/mod_auth_ntlm_winbind/debian/auth_ntlm_winbind.load 2006-11-14 18:14:25 UTC (rev 677) +++ trunk/mod_auth_ntlm_winbind/debian/auth_ntlm_winbind.load 2006-11-14 22:18:50 UTC (rev 678) @@ -1 +1 @@ -LoadModule ntlm_winbind_module /usr/lib/apache2/modules/mod_auth_ntlm_winbind.so +LoadModule ntlm_auth_winbind_module /usr/lib/apache2/modules/mod_auth_ntlm_winbind.so Modified: trunk/mod_auth_ntlm_winbind/debian/copyright === --- trunk/mod_auth_ntlm_winbind/debian/copyright2006-11-14 18:14:25 UTC (rev 677) +++ trunk/mod_auth_ntlm_winbind/debian/copyright2006-11-14 22:18:50 UTC (rev 678) @@ -1,7 +1,7 @@ This package was debianized by Jelmer Vernooij [EMAIL PROTECTED] on Sat, 8 Apr 2006 14:30:13 +0100. -It was downloaded from SVN at svn://svn.samba.org/lorikeet/trunk/mod_ntlm_winbind +It was downloaded from SVN at svn://svn.samba.org/lorikeet/trunk/mod_auth_ntlm_winbind Copyright:
svn commit: lorikeet r679 - in trunk/mod_auth_ntlm_winbind/debian: .
Author: lmuelle Date: 2006-11-14 22:23:39 + (Tue, 14 Nov 2006) New Revision: 679 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=lorikeetrev=679 Log: Pedantic remove of superfluous spaces at the end of line and line break to make reading of the repository URL easier. Modified: trunk/mod_auth_ntlm_winbind/debian/copyright Changeset: Modified: trunk/mod_auth_ntlm_winbind/debian/copyright === --- trunk/mod_auth_ntlm_winbind/debian/copyright2006-11-14 22:18:50 UTC (rev 678) +++ trunk/mod_auth_ntlm_winbind/debian/copyright2006-11-14 22:23:39 UTC (rev 679) @@ -1,9 +1,10 @@ -This package was debianized by Jelmer Vernooij [EMAIL PROTECTED] on +This package was debianized by Jelmer Vernooij [EMAIL PROTECTED] on Sat, 8 Apr 2006 14:30:13 +0100. -It was downloaded from SVN at svn://svn.samba.org/lorikeet/trunk/mod_auth_ntlm_winbind +It was downloaded from SVN at +svn://svn.samba.org/lorikeet/trunk/mod_auth_ntlm_winbind -Copyright: +Copyright: Andreas Gal [EMAIL PROTECTED] Sverre H. Huseby [EMAIL PROTECTED]
svn commit: lorikeet r680 - in trunk/mod_auth_ntlm_winbind: .
Author: lmuelle Date: 2006-11-14 23:28:53 + (Tue, 14 Nov 2006) New Revision: 680 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=lorikeetrev=680 Log: Consolidate documentation in the README. Replace duplication form the source by a short pointer to the README. Modified: trunk/mod_auth_ntlm_winbind/README trunk/mod_auth_ntlm_winbind/mod_auth_ntlm_winbind.c Changeset: Modified: trunk/mod_auth_ntlm_winbind/README === --- trunk/mod_auth_ntlm_winbind/README 2006-11-14 22:23:39 UTC (rev 679) +++ trunk/mod_auth_ntlm_winbind/README 2006-11-14 23:28:53 UTC (rev 680) @@ -1,7 +1,19 @@ -mod_auth_ntlm_winbind is an Apache 1.x/2.x module that provides NTLM -and Basic authentication via winbind. +OVERVIEW -INSTALLATION: +The mod_auth_ntlm_winbind module provides authentication and +authorisation over the web against a Microsoft Windows NT/2000/XP or +Samba Domain Controller using Samba's winbind daemon running on the +same machine Apache 1.x or 2.x is running on. + +Used only by IE and newer versions of the Mozilla browser family, the +NTLM over HTTP protocol is completed undocumented by Microsoft but has +been reverse engineered and described at the following URL: + +http://davenport.sf.net/ntlm.html + + +INSTALLATION + The configure.in script and Makefile are essentially wrappers around apxs, which should be able to do all the work by itself. Having said that, the build/install process should simply be a matter of: @@ -27,7 +39,9 @@ $ apxs -DAPACHE2 -c -i mod_auth_ntlm_winbind.c (substitute apxs2 as appropriate) + CONFIGURATION + mod_auth_ntlm_winbind uses the same ntlm_auth helper as the Squid proxy, so the same setup applies as for Squid: the winbindd_privileged directory must be accessible by the webserver userid. The @@ -51,11 +65,13 @@ PlaintextAuthHelper Location and arguments to the Samba ntlm_auth utility for Plaintext auth -Here are some example configuration blocks: +The following httpd.conf configuration describes an example +configuration for this module: + NTLM authentication: -Directory /var/www/auth +Directory /srv/www/auth AuthName NTLM Authentication thingy NTLMAuth on NTLMAuthHelper /usr/bin/ntlm_auth --helper-protocol=squid-2.5-ntlmssp @@ -64,9 +80,9 @@ require valid-user /Directory -NTLM+Negotiate authentication: +or, to enable 'NTLM+Negotiate' authentication too: -Directory /var/www/auth +Directory /srv/www/auth AuthName NTLM Authentication thingy NTLMAuth on NegotiateAuth on @@ -77,3 +93,9 @@ AuthType Negotiate require valid-user /Directory + + +To debug what is going on, add the following line to your httpd.conf +to enable debug messages to be written to the apache error log file: + +LogLevel debug Modified: trunk/mod_auth_ntlm_winbind/mod_auth_ntlm_winbind.c === --- trunk/mod_auth_ntlm_winbind/mod_auth_ntlm_winbind.c 2006-11-14 22:23:39 UTC (rev 679) +++ trunk/mod_auth_ntlm_winbind/mod_auth_ntlm_winbind.c 2006-11-14 23:28:53 UTC (rev 680) @@ -36,53 +36,9 @@ */ - /* - * OVERVIEW: - * - * The mod_auth_ntlm_winbind module allows authentication and authorisation - * over the web against a Windows NT/2000/XP domain controller using the - * winbind daemon running on the same machine apache is running on. - * - * Used only by IE and newer versions of Mozilla, the NTLM over HTTP protocol is completed undocumented - * by Microsoft but has been reverse engineered and described at the - * following URL: - * - * http://davenport.sf.net/ntlm.html - * - * CONFIGURATION: - * - * The following httpd.conf configuration describes an example - * configuration for this module: - * - * Directory /var/www/auth - * AuthName NTLM Authentication thingy - * NTLMAuth on - * NTLMAuthHelper /usr/bin/ntlm_auth --helper-protocol=squid-2.5-ntlmssp - * NTLMBasicAuthoritative on - * AuthType NTLM - * require valid-user - * /Directory - * - * or, to enable 'Negotiate' authentication too: - * - * Directory /var/www/auth - * AuthName NTLM Authentication thingy - * NTLMAuth on - * NegotiateAuth on - * NTLMAuthHelper /usr/bin/ntlm_auth --helper-protocol=squid-2.5-ntlmssp - * NegotiateAuthHelper /usr/bin/ntlm_auth --helper-protocol=gss-spnego - * NTLMBasicAuthoritative on - * AuthType NTLM - * AuthType Negotiate - * require valid-user - * /Directory - * - * To debug what is going on, add the following line to your httpd.conf - * to enable debug messages to be written to the apache error log file: - * - * LogLevel debug - * + * The sections OVERVIEW, INSTALLATION, and CONFIGURATION are available from + * the README file in this directory. */ #include httpd.h
svn commit: lorikeet r660 - in trunk/mod_ntlm_winbind: .
Author: lmuelle Date: 2006-11-08 23:20:37 + (Wed, 08 Nov 2006) New Revision: 660 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=lorikeetrev=660 Log: [PATCH] Don't set content length in auth reply Found a problem with the 401 response coming back from apache after the client sends their NTLMSSP_NEGOTIATE request. The code is setting the content length header to zero, but Apache was including it's own error page in the response body. According to RFC2616, a 401 response doesn't have to have a zero length, so probably it's the auth module which is at fault. Just removing the code which sets this causes Apache to set the content encoding to chunked which takes care of the problem. Tested on Apache 2.0.54 (Debian Sarge). Signed-off-by: Kevin Shanahan [EMAIL PROTECTED] Tested also for several Apache versions on SUSE Linux with http and https. Modified: trunk/mod_ntlm_winbind/mod_ntlm_winbind.c Changeset: Modified: trunk/mod_ntlm_winbind/mod_ntlm_winbind.c === --- trunk/mod_ntlm_winbind/mod_ntlm_winbind.c 2006-11-08 03:57:34 UTC (rev 659) +++ trunk/mod_ntlm_winbind/mod_ntlm_winbind.c 2006-11-08 23:20:37 UTC (rev 660) @@ -456,9 +456,6 @@ /* Read negotiate from ntlm_auth */ apr_table_setn(r-err_headers_out, - Content-Length , 0); - -apr_table_setn(r-err_headers_out, r-proxyreq ? Proxy-Authenticate : WWW-Authenticate, apr_psprintf(r-pool, %s %s, auth_scheme, reply));
svn commit: samba r16294 - branches/SAMBA_3_0/source trunk/source
Author: lmuelle Date: 2006-06-16 14:34:36 + (Fri, 16 Jun 2006) New Revision: 16294 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=16294 Log: Fix syntax error. Credits to Andreas Schwab from SUSE Linux for this fix. Modified: branches/SAMBA_3_0/source/aclocal.m4 trunk/source/aclocal.m4 Changeset: Modified: branches/SAMBA_3_0/source/aclocal.m4 === --- branches/SAMBA_3_0/source/aclocal.m42006-06-16 14:29:12 UTC (rev 16293) +++ branches/SAMBA_3_0/source/aclocal.m42006-06-16 14:34:36 UTC (rev 16294) @@ -804,7 +804,7 @@ old_LDFLAGS=$LDFLAGS; LDFLAGS=$4; export LDFLAGS; - AC_TRY_RUN([$1],[$5],[$6],[$7]); + AC_TRY_RUN([$1],[$5],[$6],[$7]) CFLAGS=$old_CFLAGS; old_CFLAGS=; export CFLAGS; Modified: trunk/source/aclocal.m4 === --- trunk/source/aclocal.m4 2006-06-16 14:29:12 UTC (rev 16293) +++ trunk/source/aclocal.m4 2006-06-16 14:34:36 UTC (rev 16294) @@ -804,7 +804,7 @@ old_LDFLAGS=$LDFLAGS; LDFLAGS=$4; export LDFLAGS; - AC_TRY_RUN([$1],[$5],[$6],[$7]); + AC_TRY_RUN([$1],[$5],[$6],[$7]) CFLAGS=$old_CFLAGS; old_CFLAGS=; export CFLAGS;
svn commit: samba r15822 - branches/SAMBA_3_0/source/libads trunk/source/libads
Author: lmuelle
Date: 2006-05-22 20:35:55 + (Mon, 22 May 2006)
New Revision: 15822
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=15822
Log:
Add suggestion made by Ralf Haferkamp.
Modified:
branches/SAMBA_3_0/source/libads/ldap.c
trunk/source/libads/ldap.c
Changeset:
Modified: branches/SAMBA_3_0/source/libads/ldap.c
===
--- branches/SAMBA_3_0/source/libads/ldap.c 2006-05-22 20:07:01 UTC (rev
15821)
+++ branches/SAMBA_3_0/source/libads/ldap.c 2006-05-22 20:35:55 UTC (rev
15822)
@@ -541,7 +541,7 @@
} else {
ExtendedDn.ldctl_value.bv_len = 0;
- ExtendedDn.ldctl_value.bv_val = CONST_DISCARD(char *,
);
+ ExtendedDn.ldctl_value.bv_val = NULL;
}
controls[0] = NoReferrals;
Modified: trunk/source/libads/ldap.c
===
--- trunk/source/libads/ldap.c 2006-05-22 20:07:01 UTC (rev 15821)
+++ trunk/source/libads/ldap.c 2006-05-22 20:35:55 UTC (rev 15822)
@@ -541,7 +541,7 @@
} else {
ExtendedDn.ldctl_value.bv_len = 0;
- ExtendedDn.ldctl_value.bv_val = CONST_DISCARD(char *,
);
+ ExtendedDn.ldctl_value.bv_val = NULL;
}
controls[0] = NoReferrals;
svn commit: samba r15180 - branches/SAMBA_3_0/source/python trunk/source/python
Author: lmuelle Date: 2006-04-23 15:39:32 + (Sun, 23 Apr 2006) New Revision: 15180 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=15180 Log: Use tdb_lock_bystring_with_timeout(). Modified: branches/SAMBA_3_0/source/python/py_tdb.c trunk/source/python/py_tdb.c Changeset: Modified: branches/SAMBA_3_0/source/python/py_tdb.c === --- branches/SAMBA_3_0/source/python/py_tdb.c 2006-04-23 15:34:47 UTC (rev 15179) +++ branches/SAMBA_3_0/source/python/py_tdb.c 2006-04-23 15:39:32 UTC (rev 15180) @@ -494,7 +494,7 @@ if (!PyArg_ParseTuple(args, s|i, s, timeout)) return NULL; - result = tdb_lock_bystring(obj-tdb, s, timeout); + result = tdb_lock_bystring_with_timeout(obj-tdb, s, timeout); return PyInt_FromLong(result != -1); } Modified: trunk/source/python/py_tdb.c === --- trunk/source/python/py_tdb.c2006-04-23 15:34:47 UTC (rev 15179) +++ trunk/source/python/py_tdb.c2006-04-23 15:39:32 UTC (rev 15180) @@ -494,7 +494,7 @@ if (!PyArg_ParseTuple(args, s|i, s, timeout)) return NULL; - result = tdb_lock_bystring(obj-tdb, s, timeout); + result = tdb_lock_bystring_with_timeout(obj-tdb, s, timeout); return PyInt_FromLong(result != -1); }
svn commit: samba r15093 - branches/SAMBA_3_0/source/python trunk/source/python
Author: lmuelle
Date: 2006-04-15 13:45:27 + (Sat, 15 Apr 2006)
New Revision: 15093
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=15093
Log:
Align to the last winbind changes.
Modified:
branches/SAMBA_3_0/source/python/py_winbind.c
trunk/source/python/py_winbind.c
Changeset:
Modified: branches/SAMBA_3_0/source/python/py_winbind.c
===
--- branches/SAMBA_3_0/source/python/py_winbind.c 2006-04-15 10:13:09 UTC
(rev 15092)
+++ branches/SAMBA_3_0/source/python/py_winbind.c 2006-04-15 13:45:27 UTC
(rev 15093)
@@ -134,8 +134,8 @@
result = PyList_New(0);
- if (response.extra_data) {
- const char *extra_data = response.extra_data;
+ if (response.extra_data.data) {
+ const char *extra_data = response.extra_data.data;
fstring name;
while (next_token(extra_data, name, ,, sizeof(fstring)))
@@ -165,8 +165,8 @@
result = PyList_New(0);
- if (response.extra_data) {
- const char *extra_data = response.extra_data;
+ if (response.extra_data.data) {
+ const char *extra_data = response.extra_data.data;
fstring name;
while (next_token(extra_data, name, ,, sizeof(fstring)))
@@ -200,8 +200,8 @@
result = PyList_New(0);
- if (response.extra_data) {
- const char *extra_data = response.extra_data;
+ if (response.extra_data.data) {
+ const char *extra_data = response.extra_data.data;
fstring name;
while (next_token(extra_data, name, ,, sizeof(fstring)))
Modified: trunk/source/python/py_winbind.c
===
--- trunk/source/python/py_winbind.c2006-04-15 10:13:09 UTC (rev 15092)
+++ trunk/source/python/py_winbind.c2006-04-15 13:45:27 UTC (rev 15093)
@@ -134,8 +134,8 @@
result = PyList_New(0);
- if (response.extra_data) {
- const char *extra_data = response.extra_data;
+ if (response.extra_data.data) {
+ const char *extra_data = response.extra_data.data;
fstring name;
while (next_token(extra_data, name, ,, sizeof(fstring)))
@@ -165,8 +165,8 @@
result = PyList_New(0);
- if (response.extra_data) {
- const char *extra_data = response.extra_data;
+ if (response.extra_data.data) {
+ const char *extra_data = response.extra_data.data;
fstring name;
while (next_token(extra_data, name, ,, sizeof(fstring)))
@@ -200,8 +200,8 @@
result = PyList_New(0);
- if (response.extra_data) {
- const char *extra_data = response.extra_data;
+ if (response.extra_data.data) {
+ const char *extra_data = response.extra_data.data;
fstring name;
while (next_token(extra_data, name, ,, sizeof(fstring)))
svn commit: samba r15094 - branches/SAMBA_3_0/examples/pam_winbind trunk/examples/pam_winbind
Author: lmuelle Date: 2006-04-15 21:24:32 + (Sat, 15 Apr 2006) New Revision: 15094 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=15094 Log: Replace ; by # where we have a comment and remove superfluous spaces at the end of lines. Modified: branches/SAMBA_3_0/examples/pam_winbind/pam_winbind.conf trunk/examples/pam_winbind/pam_winbind.conf Changeset: Modified: branches/SAMBA_3_0/examples/pam_winbind/pam_winbind.conf === --- branches/SAMBA_3_0/examples/pam_winbind/pam_winbind.conf2006-04-15 13:45:27 UTC (rev 15093) +++ branches/SAMBA_3_0/examples/pam_winbind/pam_winbind.conf2006-04-15 21:24:32 UTC (rev 15094) @@ -1,26 +1,26 @@ -; -; pam_winbind configuration file -; -; /etc/security/pam_winbind.conf -; +# +# pam_winbind configuration file +# +# /etc/security/pam_winbind.conf +# [global] -; turn on debugging +# turn on debugging ;debug = no -; request a cached login if possible -; (needs winbind offline logon = yes in smb.conf) +# request a cached login if possible +# (needs winbind offline logon = yes in smb.conf) ;cached_login = no -; authenticate using kerberos +# authenticate using kerberos ;krb5_auth = no -; when using kerberos, request a FILE krb5 credential cache type -; (leave empty to just do krb5 authentication but not have a ticket -; afterwards) -;krb5_ccache_type = +# when using kerberos, request a FILE krb5 credential cache type +# (leave empty to just do krb5 authentication but not have a ticket +# afterwards) +;krb5_ccache_type = -; make successful authentication dependend on membership of one SID -; (can also take a name) +# make successful authentication dependend on membership of one SID +# (can also take a name) ;require_membership_of = Modified: trunk/examples/pam_winbind/pam_winbind.conf === --- trunk/examples/pam_winbind/pam_winbind.conf 2006-04-15 13:45:27 UTC (rev 15093) +++ trunk/examples/pam_winbind/pam_winbind.conf 2006-04-15 21:24:32 UTC (rev 15094) @@ -1,26 +1,26 @@ -; -; pam_winbind configuration file -; -; /etc/security/pam_winbind.conf -; +# +# pam_winbind configuration file +# +# /etc/security/pam_winbind.conf +# [global] -; turn on debugging +# turn on debugging ;debug = no -; request a cached login if possible -; (needs winbind offline logon = yes in smb.conf) +# request a cached login if possible +# (needs winbind offline logon = yes in smb.conf) ;cached_login = no -; authenticate using kerberos +# authenticate using kerberos ;krb5_auth = no -; when using kerberos, request a FILE krb5 credential cache type -; (leave empty to just do krb5 authentication but not have a ticket -; afterwards) -;krb5_ccache_type = +# when using kerberos, request a FILE krb5 credential cache type +# (leave empty to just do krb5 authentication but not have a ticket +# afterwards) +;krb5_ccache_type = -; make successful authentication dependend on membership of one SID -; (can also take a name) +# make successful authentication dependend on membership of one SID +# (can also take a name) ;require_membership_of =
svn commit: samba r14922 - branches/SAMBA_3_0/source/param trunk/source/param
Author: lmuelle
Date: 2006-04-05 07:29:22 + (Wed, 05 Apr 2006)
New Revision: 14922
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=14922
Log:
Use BOOL for the returned value.
Modified:
branches/SAMBA_3_0/source/param/loadparm.c
trunk/source/param/loadparm.c
Changeset:
Modified: branches/SAMBA_3_0/source/param/loadparm.c
===
--- branches/SAMBA_3_0/source/param/loadparm.c 2006-04-05 06:25:32 UTC (rev
14921)
+++ branches/SAMBA_3_0/source/param/loadparm.c 2006-04-05 07:29:22 UTC (rev
14922)
@@ -3877,7 +3877,8 @@
BOOL dump_a_parameter(int snum, char *parm_name, FILE * f, BOOL isGlobal)
{
service * pService = ServicePtrs[snum];
- int i, result = False;
+ int i;
+ BOOL result = False;
parm_class p_class;
unsigned flag = 0;
fstring local_parm_name;
Modified: trunk/source/param/loadparm.c
===
--- trunk/source/param/loadparm.c 2006-04-05 06:25:32 UTC (rev 14921)
+++ trunk/source/param/loadparm.c 2006-04-05 07:29:22 UTC (rev 14922)
@@ -3877,7 +3877,8 @@
BOOL dump_a_parameter(int snum, char *parm_name, FILE * f, BOOL isGlobal)
{
service * pService = ServicePtrs[snum];
- int i, result = False;
+ int i;
+ BOOL result = False;
parm_class p_class;
unsigned flag = 0;
fstring local_parm_name;
svn commit: samba r14923 - branches/SAMBA_3_0/source/param trunk/source/param
Author: lmuelle
Date: 2006-04-05 07:44:14 + (Wed, 05 Apr 2006)
New Revision: 14923
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=14923
Log:
Return False in the case a parametrical option is not configured in
the config file.
For a somesettings: foo = we still return an empty line.
Modified:
branches/SAMBA_3_0/source/param/loadparm.c
trunk/source/param/loadparm.c
Changeset:
Modified: branches/SAMBA_3_0/source/param/loadparm.c
===
--- branches/SAMBA_3_0/source/param/loadparm.c 2006-04-05 07:29:22 UTC (rev
14922)
+++ branches/SAMBA_3_0/source/param/loadparm.c 2006-04-05 07:44:14 UTC (rev
14923)
@@ -3883,6 +3883,7 @@
unsigned flag = 0;
fstring local_parm_name;
char *parm_opt;
+ const char *parm_opt_value;
/* check for parametrical option */
fstrcpy( local_parm_name, parm_name);
@@ -3892,9 +3893,12 @@
*parm_opt = '\0';
parm_opt++;
if (strlen(parm_opt)) {
- printf( %s\n, lp_parm_const_string( snum,
- local_parm_name, parm_opt, ));
- result = True;
+ parm_opt_value = lp_parm_const_string( snum,
+ local_parm_name, parm_opt, NULL);
+ if (parm_opt_value) {
+ printf( %s\n, parm_opt_value);
+ result = True;
+ }
}
return result;
}
Modified: trunk/source/param/loadparm.c
===
--- trunk/source/param/loadparm.c 2006-04-05 07:29:22 UTC (rev 14922)
+++ trunk/source/param/loadparm.c 2006-04-05 07:44:14 UTC (rev 14923)
@@ -3883,6 +3883,7 @@
unsigned flag = 0;
fstring local_parm_name;
char *parm_opt;
+ const char *parm_opt_value;
/* check for parametrical option */
fstrcpy( local_parm_name, parm_name);
@@ -3892,9 +3893,12 @@
*parm_opt = '\0';
parm_opt++;
if (strlen(parm_opt)) {
- printf( %s\n, lp_parm_const_string( snum,
- local_parm_name, parm_opt, ));
- result = True;
+ parm_opt_value = lp_parm_const_string( snum,
+ local_parm_name, parm_opt, NULL);
+ if (parm_opt_value) {
+ printf( %s\n, parm_opt_value);
+ result = True;
+ }
}
return result;
}
svn commit: samba-docs r935 - in trunk/manpages-3: .
Author: lmuelle Date: 2006-04-03 10:08:54 + (Mon, 03 Apr 2006) New Revision: 935 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=samba-docsrev=935 Log: Add paragraph about how to dump a parametrical option. Modified: trunk/manpages-3/testparm.1.xml Changeset: Modified: trunk/manpages-3/testparm.1.xml === --- trunk/manpages-3/testparm.1.xml 2006-03-30 14:24:55 UTC (rev 934) +++ trunk/manpages-3/testparm.1.xml 2006-04-03 10:08:54 UTC (rev 935) @@ -97,6 +97,10 @@ listitempara Dumps the named parameter. If no section-name is set the view is limited by default to the global section. + + It is also possible to dump a parametrical option. Therfore + the option has to be separated by a colon from the + parametername. /para/listitem /varlistentry
svn commit: samba r14869 - branches/SAMBA_3_0/source/param trunk/source/param
Author: lmuelle
Date: 2006-04-02 21:12:23 + (Sun, 02 Apr 2006)
New Revision: 14869
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=14869
Log:
Allow to dump a paramatrical option.
Flaw: We print an empty line if the paramatrical option is not defined
in the requested section.
Modified:
branches/SAMBA_3_0/source/param/loadparm.c
trunk/source/param/loadparm.c
Changeset:
Modified: branches/SAMBA_3_0/source/param/loadparm.c
===
--- branches/SAMBA_3_0/source/param/loadparm.c 2006-04-02 19:45:42 UTC (rev
14868)
+++ branches/SAMBA_3_0/source/param/loadparm.c 2006-04-02 21:12:23 UTC (rev
14869)
@@ -3880,13 +3880,31 @@
int i, result = False;
parm_class p_class;
unsigned flag = 0;
+ fstring local_parm_name;
+ char *parm_opt;
+ /* check for parametrical option */
+ fstrcpy( local_parm_name, parm_name);
+ parm_opt = strchr( local_parm_name, ':');
+
+ if (parm_opt) {
+ *parm_opt = '\0';
+ parm_opt++;
+ if (strlen(parm_opt)) {
+ printf( %s\n, lp_parm_const_string( snum,
+ local_parm_name, parm_opt, ));
+ result = True;
+ }
+ return result;
+ }
+
+ /* check for a key and print the value */
if (isGlobal) {
p_class = P_GLOBAL;
flag = FLAG_GLOBAL;
} else
p_class = P_LOCAL;
-
+
for (i = 0; parm_table[i].label; i++) {
if (strwicmp(parm_table[i].label, parm_name) == 0
(parm_table[i].p_class == p_class || parm_table[i].flags
flag)
Modified: trunk/source/param/loadparm.c
===
--- trunk/source/param/loadparm.c 2006-04-02 19:45:42 UTC (rev 14868)
+++ trunk/source/param/loadparm.c 2006-04-02 21:12:23 UTC (rev 14869)
@@ -3880,13 +3880,31 @@
int i, result = False;
parm_class p_class;
unsigned flag = 0;
+ fstring local_parm_name;
+ char *parm_opt;
+ /* check for parametrical option */
+ fstrcpy( local_parm_name, parm_name);
+ parm_opt = strchr( local_parm_name, ':');
+
+ if (parm_opt) {
+ *parm_opt = '\0';
+ parm_opt++;
+ if (strlen(parm_opt)) {
+ printf( %s\n, lp_parm_const_string( snum,
+ local_parm_name, parm_opt, ));
+ result = True;
+ }
+ return result;
+ }
+
+ /* check for a key and print the value */
if (isGlobal) {
p_class = P_GLOBAL;
flag = FLAG_GLOBAL;
} else
p_class = P_LOCAL;
-
+
for (i = 0; parm_table[i].label; i++) {
if (strwicmp(parm_table[i].label, parm_name) == 0
(parm_table[i].p_class == p_class || parm_table[i].flags
flag)
svn commit: samba r14659 - branches/SAMBA_3_0/source trunk/source
Author: lmuelle
Date: 2006-03-22 20:16:50 + (Wed, 22 Mar 2006)
New Revision: 14659
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=14659
Log:
Fix installpammodules for shells where a
for module in ; do ... ; done
leads to an error (true64, solaris 8).
We now use {,UN}INSTALL_PAM_MODULES to get replaced by configure.
Therfore we don't run into the {,un}installpammodules rule if no PAM
module is requested.
Thanks to Bj?\195?\182rn Jacke for pointing to this issue.
Modified:
branches/SAMBA_3_0/source/Makefile.in
branches/SAMBA_3_0/source/configure.in
trunk/source/Makefile.in
trunk/source/configure.in
Changeset:
Modified: branches/SAMBA_3_0/source/Makefile.in
===
--- branches/SAMBA_3_0/source/Makefile.in 2006-03-22 20:01:15 UTC (rev
14658)
+++ branches/SAMBA_3_0/source/Makefile.in 2006-03-22 20:16:50 UTC (rev
14659)
@@ -1414,7 +1414,7 @@
bin/[EMAIL PROTECTED]@: script/tests/timelimit.c
$(CC) $(FLAGS) @PIE_LDFLAGS@ -o $@ $(DYNEXP) script/tests/timelimit.c
-install: installservers installbin @INSTALL_CIFSMOUNT@ installman
installscripts installdat installswat installmodules @INSTALL_LIBSMBCLIENT@
@INSTALL_LIBMSRPC@ installpammodules
+install: installservers installbin @INSTALL_CIFSMOUNT@ installman
installscripts installdat installswat installmodules @INSTALL_LIBSMBCLIENT@
@INSTALL_LIBMSRPC@ @INSTALL_PAM_MODULES@
install-everything: install installmodules
@@ -1481,9 +1481,7 @@
-$(INSTALLCMD) $(srcdir)/include/libmsrpc.h $(DESTDIR)${prefix}/include
installpammodules: $(PAM_MODULES)
- @if test $(PAM_MODULES); then \
- $(SHELL) $(srcdir)/script/installdirs.sh $(INSTALLPERMS)
$(DESTDIR) $(PAMMODULESDIR); \
- fi
+ @$(SHELL) $(srcdir)/script/installdirs.sh $(INSTALLPERMS) $(DESTDIR)
$(PAMMODULESDIR)
@for module in $(PAM_MODULES); do \
echo Installing module $${module} as
$(DESTDIR)/$(PAMMODULESDIR)/[EMAIL PROTECTED]@ ; \
install -m $(INSTALLPERMS) bin/[EMAIL PROTECTED]@ \
@@ -1546,7 +1544,7 @@
@echo swatdir: $(SWATDIR)
-uninstall: uninstallman uninstallservers uninstallbin @UNINSTALL_CIFSMOUNT@
uninstallscripts uninstalldat uninstallswat uninstallmodules
@UNINSTALL_LIBSMBCLIENT@ @UNINSTALL_LIBMSRPC@ uninstallpammodules
+uninstall: uninstallman uninstallservers uninstallbin @UNINSTALL_CIFSMOUNT@
uninstallscripts uninstalldat uninstallswat uninstallmodules
@UNINSTALL_LIBSMBCLIENT@ @UNINSTALL_LIBMSRPC@ @UNINSTALL_PAM_MODULES@
uninstallman:
@$(SHELL) $(srcdir)/script/uninstallman.sh $(DESTDIR)$(MANDIR)
$(srcdir) C
Modified: branches/SAMBA_3_0/source/configure.in
===
--- branches/SAMBA_3_0/source/configure.in 2006-03-22 20:01:15 UTC (rev
14658)
+++ branches/SAMBA_3_0/source/configure.in 2006-03-22 20:16:50 UTC (rev
14659)
@@ -275,6 +275,8 @@
AC_SUBST(LDAP_LIBS)
AC_SUBST(SHLIB_PROGS)
AC_SUBST(PAM_MODULES)
+AC_SUBST(INSTALL_PAM_MODULES)
+AC_SUBST(UNINSTALL_PAM_MODULES)
AC_SUBST(SMBWRAPPER)
AC_SUBST(SMBWRAP_OBJS)
AC_SUBST(SMBWRAP_INC)
@@ -3727,6 +3729,8 @@
#
# check for pam_smbpass support
PAM_MODULES=
+INSTALL_PAM_MODULES=
+UNINSTALL_PAM_MODULES=
AC_MSG_CHECKING(whether to use pam_smbpass)
AC_ARG_WITH(pam_smbpass,
[ --with-pam_smbpass Build PAM module for authenticating against passdb
backends (default=no)],
@@ -3745,6 +3749,8 @@
else
AUTH_LIBS=$AUTH_LIBS -lpam
PAM_MODULES=pam_smbpass
+ INSTALL_PAM_MODULES=installpammodules
+ UNINSTALL_PAM_MODULES=uninstallpammodules
fi
;;
*)
@@ -5191,6 +5197,8 @@
if test x$with_pam = xyes; then
PAM_MODULES=$PAM_MODULES pam_winbind
+ INSTALL_PAM_MODULES=installpammodules
+ UNINSTALL_PAM_MODULES=uninstallpammodules
fi
fi
else
Modified: trunk/source/Makefile.in
===
--- trunk/source/Makefile.in2006-03-22 20:01:15 UTC (rev 14658)
+++ trunk/source/Makefile.in2006-03-22 20:16:50 UTC (rev 14659)
@@ -1443,7 +1443,7 @@
bin/[EMAIL PROTECTED]@: script/tests/timelimit.c
$(CC) $(FLAGS) @PIE_LDFLAGS@ -o $@ $(DYNEXP) script/tests/timelimit.c
-install: installservers installbin @INSTALL_CIFSMOUNT@ installman
installscripts installdat installswat installmodules @INSTALL_LIBSMBCLIENT@
@INSTALL_LIBMSRPC@ installpammodules
+install: installservers installbin @INSTALL_CIFSMOUNT@ installman
installscripts installdat installswat installmodules @INSTALL_LIBSMBCLIENT@
@INSTALL_LIBMSRPC@ @INSTALL_PAM_MODULES@
install-everything: install installmodules
@@ -1510,9 +1510,7 @@
-$(INSTALLCMD) $(srcdir)/include/libmsrpc.h $(DESTDIR)${prefix
svn commit: samba r14617 - branches/SAMBA_3_0/source trunk/source
Author: lmuelle Date: 2006-03-21 12:32:12 + (Tue, 21 Mar 2006) New Revision: 14617 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=14617 Log: Fix typo in comment. Modified: branches/SAMBA_3_0/source/configure.in trunk/source/configure.in Changeset: Modified: branches/SAMBA_3_0/source/configure.in === --- branches/SAMBA_3_0/source/configure.in 2006-03-21 11:47:24 UTC (rev 14616) +++ branches/SAMBA_3_0/source/configure.in 2006-03-21 12:32:12 UTC (rev 14617) @@ -176,7 +176,7 @@ esac]) # -# set lib directory location +# set man directory location AC_ARG_WITH(mandir, [ --with-mandir=DIR Where to put man pages ($mandir)], [ case $withval in Modified: trunk/source/configure.in === --- trunk/source/configure.in 2006-03-21 11:47:24 UTC (rev 14616) +++ trunk/source/configure.in 2006-03-21 12:32:12 UTC (rev 14617) @@ -176,7 +176,7 @@ esac]) # -# set lib directory location +# set man directory location AC_ARG_WITH(mandir, [ --with-mandir=DIR Where to put man pages ($mandir)], [ case $withval in
svn commit: samba r14626 - branches/SAMBA_3_0/source trunk/source
Author: lmuelle
Date: 2006-03-21 16:18:34 + (Tue, 21 Mar 2006)
New Revision: 14626
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=14626
Log:
Only set libdir and mandir to the defaults if we haven't used --libdir
or --mandir to set them already. Till now we overwrrote a setting made
with --libdir or --mandir.
Modified:
branches/SAMBA_3_0/source/configure.in
trunk/source/configure.in
Changeset:
Modified: branches/SAMBA_3_0/source/configure.in
===
--- branches/SAMBA_3_0/source/configure.in 2006-03-21 15:38:27 UTC (rev
14625)
+++ branches/SAMBA_3_0/source/configure.in 2006-03-21 16:18:34 UTC (rev
14626)
@@ -25,10 +25,10 @@
rootsbindir=\${SBINDIR}
lockdir=\${VARDIR}/locks
piddir=\${VARDIR}/locks
-mandir=\${prefix}/man
+test ${mandir} || mandir=\${prefix}/man
logfilebase=\${VARDIR}
privatedir=\${prefix}/private
-libdir=\${prefix}/lib
+test ${libdir} || libdir=\${prefix}/lib
configdir=\${LIBDIR}
swatdir=\${prefix}/swat
Modified: trunk/source/configure.in
===
--- trunk/source/configure.in 2006-03-21 15:38:27 UTC (rev 14625)
+++ trunk/source/configure.in 2006-03-21 16:18:34 UTC (rev 14626)
@@ -25,10 +25,10 @@
rootsbindir=\${SBINDIR}
lockdir=\${VARDIR}/locks
piddir=\${VARDIR}/locks
-mandir=\${prefix}/man
+test ${mandir} || mandir=\${prefix}/man
logfilebase=\${VARDIR}
privatedir=\${prefix}/private
-libdir=\${prefix}/lib
+test ${libdir} || libdir=\${prefix}/lib
configdir=\${LIBDIR}
swatdir=\${prefix}/swat
svn commit: samba r14627 - branches/SAMBA_3_0/source trunk/source
Author: lmuelle Date: 2006-03-21 19:50:28 + (Tue, 21 Mar 2006) New Revision: 14627 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=14627 Log: Adapt the linkage text from pam_smbpass to pam_winbind. Modified: branches/SAMBA_3_0/source/Makefile.in trunk/source/Makefile.in Changeset: Modified: branches/SAMBA_3_0/source/Makefile.in === --- branches/SAMBA_3_0/source/Makefile.in 2006-03-21 16:18:34 UTC (rev 14626) +++ branches/SAMBA_3_0/source/Makefile.in 2006-03-21 19:50:28 UTC (rev 14627) @@ -1215,7 +1215,7 @@ @[EMAIL PROTECTED] [EMAIL PROTECTED]@NSSSONAMEVERSIONSUFFIX@ bin/[EMAIL PROTECTED]@: $(PAM_WINBIND_PICOBJ) bin/.dummy - @echo Linking $@ + @echo Linking shared library $@ @$(SHLD) $(LDSHFLAGS) -o $@ $(PAM_WINBIND_PICOBJ) \ @[EMAIL PROTECTED] [EMAIL PROTECTED] $(LIBS) -lpam Modified: trunk/source/Makefile.in === --- trunk/source/Makefile.in2006-03-21 16:18:34 UTC (rev 14626) +++ trunk/source/Makefile.in2006-03-21 19:50:28 UTC (rev 14627) @@ -1244,7 +1244,7 @@ @[EMAIL PROTECTED] [EMAIL PROTECTED]@NSSSONAMEVERSIONSUFFIX@ bin/[EMAIL PROTECTED]@: $(PAM_WINBIND_PICOBJ) bin/.dummy - @echo Linking $@ + @echo Linking shared library $@ @$(SHLD) $(LDSHFLAGS) -o $@ $(PAM_WINBIND_PICOBJ) \ @[EMAIL PROTECTED] [EMAIL PROTECTED] $(LIBS) -lpam
svn commit: samba r14630 - in trunk/source/smbd: .
Author: lmuelle
Date: 2006-03-21 21:39:29 + (Tue, 21 Mar 2006)
New Revision: 14630
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=14630
Log:
Add missing no_process_group to become_daemon() call.
Modified:
trunk/source/smbd/server.c
Changeset:
Modified: trunk/source/smbd/server.c
===
--- trunk/source/smbd/server.c 2006-03-21 21:27:35 UTC (rev 14629)
+++ trunk/source/smbd/server.c 2006-03-21 21:39:29 UTC (rev 14630)
@@ -867,7 +867,7 @@
if (is_daemon !interactive) {
DEBUG( 3, ( Becoming a daemon.\n ) );
- become_daemon(Fork);
+ become_daemon(Fork, no_process_group);
}
#if HAVE_SETPGID
svn commit: samba r14631 - branches/SAMBA_3_0/source trunk/source
Author: lmuelle
Date: 2006-03-21 21:54:53 + (Tue, 21 Mar 2006)
New Revision: 14631
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=14631
Log:
Add {,un}installpammodules rule and add it to the install rule.
Nothing happens if PAM_MODULES is empty which is our default.
The default destination dir is ${LIBDIR}/security. It's possible to
overwrite the default with --with-pammodulesdir while calling configure.
Modified:
branches/SAMBA_3_0/source/Makefile.in
branches/SAMBA_3_0/source/configure.in
trunk/source/Makefile.in
trunk/source/configure.in
Changeset:
Modified: branches/SAMBA_3_0/source/Makefile.in
===
--- branches/SAMBA_3_0/source/Makefile.in 2006-03-21 21:39:29 UTC (rev
14630)
+++ branches/SAMBA_3_0/source/Makefile.in 2006-03-21 21:54:53 UTC (rev
14631)
@@ -65,6 +65,7 @@
SBINDIR = @sbindir@
ROOTSBINDIR = @rootsbindir@
LIBDIR = @libdir@
+PAMMODULESDIR = @pammodulesdir@
VFSLIBDIR = $(LIBDIR)/vfs
PDBLIBDIR = $(LIBDIR)/pdb
RPCLIBDIR = $(LIBDIR)/rpc
@@ -1412,7 +1413,7 @@
bin/[EMAIL PROTECTED]@: script/tests/timelimit.c
$(CC) $(FLAGS) @PIE_LDFLAGS@ -o $@ $(DYNEXP) script/tests/timelimit.c
-install: installservers installbin @INSTALL_CIFSMOUNT@ installman
installscripts installdat installswat installmodules @INSTALL_LIBSMBCLIENT@
@INSTALL_LIBMSRPC@
+install: installservers installbin @INSTALL_CIFSMOUNT@ installman
installscripts installdat installswat installmodules @INSTALL_LIBSMBCLIENT@
@INSTALL_LIBMSRPC@ installpammodules
install-everything: install installmodules
@@ -1478,6 +1479,16 @@
@$(SHELL) $(srcdir)/script/installdirs.sh $(INSTALLPERMS) $(DESTDIR)
${prefix}/include
-$(INSTALLCMD) $(srcdir)/include/libmsrpc.h $(DESTDIR)${prefix}/include
+installpammodules: $(PAM_MODULES)
+ @if test $(PAM_MODULES); then \
+ $(SHELL) $(srcdir)/script/installdirs.sh $(INSTALLPERMS)
$(DESTDIR) $(PAMMODULESDIR); \
+ fi
+ @for module in $(PAM_MODULES); do \
+ echo Installing module $${module} as
$(DESTDIR)/$(PAMMODULESDIR)/[EMAIL PROTECTED]@ ; \
+ install -m $(INSTALLPERMS) bin/[EMAIL PROTECTED]@ \
+ $(DESTDIR)/$(PAMMODULESDIR); \
+ done
+
# Python extensions
PYTHON_OBJS = $(PARAM_OBJ) $(LIB_NONSMBD_OBJ) $(LIBSMB_OBJ) $(RPC_PARSE_OBJ) \
@@ -1534,7 +1545,7 @@
@echo swatdir: $(SWATDIR)
-uninstall: uninstallman uninstallservers uninstallbin @UNINSTALL_CIFSMOUNT@
uninstallscripts uninstalldat uninstallswat uninstallmodules
@UNINSTALL_LIBSMBCLIENT@ @UNINSTALL_LIBMSRPC@
+uninstall: uninstallman uninstallservers uninstallbin @UNINSTALL_CIFSMOUNT@
uninstallscripts uninstalldat uninstallswat uninstallmodules
@UNINSTALL_LIBSMBCLIENT@ @UNINSTALL_LIBMSRPC@ uninstallpammodules
uninstallman:
@$(SHELL) $(srcdir)/script/uninstallman.sh $(DESTDIR)$(MANDIR)
$(srcdir) C
@@ -1578,6 +1589,12 @@
-$(UNINSTALLLIBCMD_A) $(DESTDIR)$(LIBDIR)/libmsrpc.a
-rm -f $(DESTDIR)${prefix}/include/libmsrpc.h
+uninstallpammodules:
+ @for module in $(PAM_MODULES); do \
+ echo Removing $(DESTDIR)/$(PAMMODULESDIR)/[EMAIL PROTECTED]@
; \
+ rm -f $(DESTDIR)/$(PAMMODULESDIR)/[EMAIL PROTECTED]@; \
+ done
+
# Toplevel clean files
TOPFILES=dynconfig.o [EMAIL PROTECTED]@
Modified: branches/SAMBA_3_0/source/configure.in
===
--- branches/SAMBA_3_0/source/configure.in 2006-03-21 21:39:29 UTC (rev
14630)
+++ branches/SAMBA_3_0/source/configure.in 2006-03-21 21:54:53 UTC (rev
14631)
@@ -29,6 +29,7 @@
logfilebase=\${VARDIR}
privatedir=\${prefix}/private
test ${libdir} || libdir=\${prefix}/lib
+pammodulesdir=\${LIBDIR}/security
configdir=\${LIBDIR}
swatdir=\${prefix}/swat
@@ -176,6 +177,22 @@
esac])
#
+# set PAM modules directory location
+AC_ARG_WITH(pammodulesdir,
+[ --with-pammodulesdir=DIR Which directory to use for PAM modules
($ac_default_prefix/$libdir/security)],
+[ case $withval in
+ yes|no)
+ #
+ # Just in case anybody calls it without argument
+ #
+AC_MSG_WARN([--with-pammodulesdir called without argument - will use
default])
+ ;;
+ * )
+pammodulesdir=$withval
+;;
+ esac])
+
+#
# set man directory location
AC_ARG_WITH(mandir,
[ --with-mandir=DIR Where to put man pages ($mandir)],
@@ -219,6 +236,7 @@
AC_SUBST(bindir)
AC_SUBST(sbindir)
AC_SUBST(rootsbindir)
+AC_SUBST(pammodulesdir)
dnl Unique-to-Samba variables we'll be playing with.
AC_SUBST(SHELL)
Modified: trunk/source/Makefile.in
===
--- trunk/source/Makefile.in2006-03-21 21:39:29 UTC (rev 14630)
+++ trunk/source/Makefile.in2006-03-21 21:54:53 UTC (rev 14631
svn commit: samba r14584 - branches/SAMBA_3_0/source trunk/source
Author: lmuelle
Date: 2006-03-20 16:40:42 + (Mon, 20 Mar 2006)
New Revision: 14584
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=14584
Log:
Really follow with roosbindir by defaulr the setting we use for sbindir.
Modified:
branches/SAMBA_3_0/source/configure.in
trunk/source/configure.in
Changeset:
Modified: branches/SAMBA_3_0/source/configure.in
===
--- branches/SAMBA_3_0/source/configure.in 2006-03-20 15:34:01 UTC (rev
14583)
+++ branches/SAMBA_3_0/source/configure.in 2006-03-20 16:40:42 UTC (rev
14584)
@@ -22,7 +22,7 @@
# ones...
AC_PREFIX_DEFAULT(/usr/local/samba)
-rootsbindir=\${prefix}/sbin
+rootsbindir=\${SBINDIR}
lockdir=\${VARDIR}/locks
piddir=\${VARDIR}/locks
mandir=\${prefix}/man
Modified: trunk/source/configure.in
===
--- trunk/source/configure.in 2006-03-20 15:34:01 UTC (rev 14583)
+++ trunk/source/configure.in 2006-03-20 16:40:42 UTC (rev 14584)
@@ -22,7 +22,7 @@
# ones...
AC_PREFIX_DEFAULT(/usr/local/samba)
-rootsbindir=\${prefix}/sbin
+rootsbindir=\${SBINDIR}
lockdir=\${VARDIR}/locks
piddir=\${VARDIR}/locks
mandir=\${prefix}/man
svn commit: samba r14317 - branches/SAMBA_3_0/packaging/Debian/debian-sarge branches/SAMBA_3_0/packaging/Debian/debian-unstable branches/SAMBA_3_0/packaging/Debian/debian-woody branches/SAMBA_3_0/pack
Author: lmuelle
Date: 2006-03-13 14:22:43 + (Mon, 13 Mar 2006)
New Revision: 14317
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=14317
Log:
Use source/bin as dir to link pam_winbind instead of source/nsswitch/
The intention is to have the resulting binaries at one place. This is
also usefull for upcoming changes to provide a test_pammodules rule.
With these changes I even got aware of
testsuite/nsswitch/pam_winbind_syms.exp But this only covers
pam_winbind.
Modified:
branches/SAMBA_3_0/packaging/Debian/debian-sarge/rules
branches/SAMBA_3_0/packaging/Debian/debian-unstable/rules
branches/SAMBA_3_0/packaging/Debian/debian-woody/rules
branches/SAMBA_3_0/packaging/RHEL/samba.spec.tmpl
branches/SAMBA_3_0/packaging/RedHat-9/samba.spec.tmpl
branches/SAMBA_3_0/packaging/Solaris/makepkg.sh
branches/SAMBA_3_0/source/Makefile.in
branches/SAMBA_3_0/source/configure.in
branches/SAMBA_3_0/testsuite/nsswitch/pam_winbind_syms.exp
trunk/packaging/Debian/debian-sarge/rules
trunk/packaging/Debian/debian-unstable/rules
trunk/packaging/Debian/debian-woody/rules
trunk/packaging/RHEL/samba.spec.tmpl
trunk/packaging/RedHat-9/samba.spec.tmpl
trunk/packaging/Solaris/makepkg.sh
trunk/source/Makefile.in
trunk/source/configure.in
trunk/testsuite/nsswitch/pam_winbind_syms.exp
Changeset:
Modified: branches/SAMBA_3_0/packaging/Debian/debian-sarge/rules
===
--- branches/SAMBA_3_0/packaging/Debian/debian-sarge/rules 2006-03-13
12:43:59 UTC (rev 14316)
+++ branches/SAMBA_3_0/packaging/Debian/debian-sarge/rules 2006-03-13
14:22:43 UTC (rev 14317)
@@ -181,7 +181,7 @@
# Install winbind stuff not installed by 'make install'
install -m 0644 source/nsswitch/libnss_winbind.so \
$(DESTDIR)/lib/libnss_winbind.so.2
- install -m 0644 source/nsswitch/pam_winbind.so \
+ install -m 0644 source/bin/pam_winbind.so \
$(DESTDIR)/lib/security/
# Install libnss_wins.so, which is not installed by 'make install'
either.
Modified: branches/SAMBA_3_0/packaging/Debian/debian-unstable/rules
===
--- branches/SAMBA_3_0/packaging/Debian/debian-unstable/rules 2006-03-13
12:43:59 UTC (rev 14316)
+++ branches/SAMBA_3_0/packaging/Debian/debian-unstable/rules 2006-03-13
14:22:43 UTC (rev 14317)
@@ -176,7 +176,7 @@
# Install winbind stuff not installed by 'make install'
install -m 0644 source/nsswitch/libnss_winbind.so \
$(DESTDIR)/lib/libnss_winbind.so.2
- install -m 0644 source/nsswitch/pam_winbind.so \
+ install -m 0644 source/bin/pam_winbind.so \
$(DESTDIR)/lib/security/
# Install libnss_wins.so, which is not installed by 'make install'
either.
Modified: branches/SAMBA_3_0/packaging/Debian/debian-woody/rules
===
--- branches/SAMBA_3_0/packaging/Debian/debian-woody/rules 2006-03-13
12:43:59 UTC (rev 14316)
+++ branches/SAMBA_3_0/packaging/Debian/debian-woody/rules 2006-03-13
14:22:43 UTC (rev 14317)
@@ -147,7 +147,7 @@
# Install winbind stuff not installed by 'make install'
install -m 0644 source/nsswitch/libnss_winbind.so \
$(DESTDIR)/lib/libnss_winbind.so.2
- install -m 0644 source/nsswitch/pam_winbind.so \
+ install -m 0644 source/bin/pam_winbind.so \
$(DESTDIR)/lib/security/
# Install libnss_wins.so, which is not installed by 'make install'
either.
Modified: branches/SAMBA_3_0/packaging/RHEL/samba.spec.tmpl
===
--- branches/SAMBA_3_0/packaging/RHEL/samba.spec.tmpl 2006-03-13 12:43:59 UTC
(rev 14316)
+++ branches/SAMBA_3_0/packaging/RHEL/samba.spec.tmpl 2006-03-13 14:22:43 UTC
(rev 14317)
@@ -211,7 +211,7 @@
cp source/bin/pam_smbpass.so $RPM_BUILD_ROOT/%{_lib}/security/pam_smbpass.so
# NSS PAM winbind support
-install -m 755 source/nsswitch/pam_winbind.so
$RPM_BUILD_ROOT/%{_lib}/security/pam_winbind.so
+install -m 755 source/bin/pam_winbind.so
$RPM_BUILD_ROOT/%{_lib}/security/pam_winbind.so
install -m 755 source/nsswitch/libnss_winbind.so
$RPM_BUILD_ROOT/%{_lib}/libnss_winbind.so
install -m 755 source/nsswitch/libnss_wins.so
$RPM_BUILD_ROOT/%{_lib}/libnss_wins.so
( cd $RPM_BUILD_ROOT/%{_lib};
Modified: branches/SAMBA_3_0/packaging/RedHat-9/samba.spec.tmpl
===
--- branches/SAMBA_3_0/packaging/RedHat-9/samba.spec.tmpl 2006-03-13
12:43:59 UTC (rev 14316)
+++ branches/SAMBA_3_0/packaging/RedHat-9/samba.spec.tmpl 2006-03-13
14:22:43 UTC (rev 14317)
@@ -177,7 +177,7 @@
# Install winbind shared libraries
install -m755 source/nsswitch/libnss_winbind.so $RPM_BUILD_ROOT/lib
( cd
svn commit: samba r14325 - branches/SAMBA_3_0/source branches/SAMBA_3_0/source/script/tests trunk/source trunk/source/script/tests
Author: lmuelle Date: 2006-03-13 16:10:26 + (Mon, 13 Mar 2006) New Revision: 14325 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=14325 Log: Add pam_modules rule which builds the configure(d) pam modules. This is called as part of the all rule (again only if pam modules are requested by configure). Add pam_winbind rule. Ensure proto_exists before we build the pam modules. Add test_pam_modules rule to test if the built pam modules have any unresolved symbols. For test_pam_modules we use script/tests/dlopen.sh which was written by Nalin Dahyabhai [EMAIL PROTECTED]. Thanks Nalin! RedHat and SuSE use this script to test nss and pam modules since several years. Added: branches/SAMBA_3_0/source/script/tests/dlopen.sh trunk/source/script/tests/dlopen.sh Modified: branches/SAMBA_3_0/source/Makefile.in branches/SAMBA_3_0/source/configure.in trunk/source/Makefile.in trunk/source/configure.in Changeset: Modified: branches/SAMBA_3_0/source/Makefile.in === --- branches/SAMBA_3_0/source/Makefile.in 2006-03-13 16:02:50 UTC (rev 14324) +++ branches/SAMBA_3_0/source/Makefile.in 2006-03-13 16:10:26 UTC (rev 14325) @@ -154,6 +154,8 @@ SHLIBS = @SHLIB_PROGS@ @LIBSMBCLIENT@ @LIBSMBSHAREMODES@ cac +PAM_MODULES = @PAM_MODULES@ + SCRIPTS = $(srcdir)/script/smbtar $(builddir)/script/findsmb VFS_MODULES = @VFS_MODULES@ @@ -754,10 +756,14 @@ # now the rules... ## all : SHOWFLAGS proto_exists $(SBIN_PROGS) $(BIN_PROGS) $(ROOT_SBIN_PROGS) \ - $(SHLIBS) $(MODULES) @EXTRA_ALL_TARGETS@ + $(SHLIBS) $(MODULES) $(PAM_MODULES) @EXTRA_ALL_TARGETS@ -pam_smbpass : SHOWFLAGS bin/[EMAIL PROTECTED]@ +pam_modules : $(PAM_MODULES) +pam_smbpass : SHOWFLAGS proto_exists bin/[EMAIL PROTECTED]@ + +pam_winbind : SHOWFLAGS proto_exists bin/[EMAIL PROTECTED]@ + smbwrapper : SHOWFLAGS @SMBWRAPPER@ torture : SHOWFLAGS $(TORTURE_PROGS) @@ -840,6 +846,12 @@ @echo Running Samba 3 Test suite @sh ./script/tests/runtests.sh t_dir +test_pam_modules: pam_modules + @echo Testing $(PAM_MODULES) + @for module in $(PAM_MODULES); do \ + ./script/tests/dlopen.sh -lpam -ldl bin/[EMAIL PROTECTED]@ \ + || exit 1; \ + done # These dependencies are only approximately correct: we want to make # sure Samba's paths are updated if ./configure is re-run. Really it Modified: branches/SAMBA_3_0/source/configure.in === --- branches/SAMBA_3_0/source/configure.in 2006-03-13 16:02:50 UTC (rev 14324) +++ branches/SAMBA_3_0/source/configure.in 2006-03-13 16:10:26 UTC (rev 14325) @@ -256,6 +256,7 @@ AC_SUBST(KRB5_LIBS) AC_SUBST(LDAP_LIBS) AC_SUBST(SHLIB_PROGS) +AC_SUBST(PAM_MODULES) AC_SUBST(SMBWRAPPER) AC_SUBST(SMBWRAP_OBJS) AC_SUBST(SMBWRAP_INC) @@ -3647,6 +3648,7 @@ # # check for pam_smbpass support +PAM_MODULES= AC_MSG_CHECKING(whether to use pam_smbpass) AC_ARG_WITH(pam_smbpass, [ --with-pam_smbpass Build PAM module for authenticating against passdb backends (default=no)], @@ -3664,7 +3666,7 @@ AC_MSG_ERROR([No libpam found]) else AUTH_LIBS=$AUTH_LIBS -lpam - SHLIB_PROGS=$SHLIB_PROGS bin/pam_smbpass.$SHLIBEXT + PAM_MODULES=pam_smbpass fi ;; *) @@ -5110,7 +5112,7 @@ SHLIB_PROGS=$SHLIB_PROGS $WINBIND_NSS $WINBIND_WINS_NSS if test x$with_pam = xyes; then - SHLIB_PROGS=$SHLIB_PROGS bin/pam_winbind.$SHLIBEXT + PAM_MODULES=$PAM_MODULES pam_winbind fi fi else Added: branches/SAMBA_3_0/source/script/tests/dlopen.sh === --- branches/SAMBA_3_0/source/script/tests/dlopen.sh2006-03-13 16:02:50 UTC (rev 14324) +++ branches/SAMBA_3_0/source/script/tests/dlopen.sh2006-03-13 16:10:26 UTC (rev 14325) @@ -0,0 +1,91 @@ +#!/bin/sh +# +# Copyright (C) Nalin Dahyabhai [EMAIL PROTECTED] 2003 +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + +tempdir=`mktemp -d /tmp/dlopenXX
svn commit: samba r14326 - branches/SAMBA_3_0/source trunk/source
Author: lmuelle Date: 2006-03-13 16:19:44 + (Mon, 13 Mar 2006) New Revision: 14326 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=14326 Log: First catch of make test_pam_modules. Testing pam_smbpass pam_winbind dlopen() of ./bin/pam_smbpass.so succeeded. dlopen() of ./bin/pam_winbind.so failed: ././bin/pam_winbind.so: undefined symbol: secrets_fetch_domain_sid make: *** [test_pam_modules] Error 1 Modified: branches/SAMBA_3_0/source/Makefile.in trunk/source/Makefile.in Changeset: Modified: branches/SAMBA_3_0/source/Makefile.in === --- branches/SAMBA_3_0/source/Makefile.in 2006-03-13 16:10:26 UTC (rev 14325) +++ branches/SAMBA_3_0/source/Makefile.in 2006-03-13 16:19:44 UTC (rev 14326) @@ -508,7 +508,7 @@ PAM_WINBIND_OBJ = nsswitch/pam_winbind.o \ $(PARAM_OBJ) $(LIB_NONSMBD_OBJ) $(RPC_PARSE_OBJ1) \ - $(LIBSAMBA_OBJ) $(DOSERR_OBJ) + $(LIBSAMBA_OBJ) $(DOSERR_OBJ) $(SECRETS_OBJ) PAM_WINBIND_PICOBJ = $(PAM_WINBIND_OBJ:[EMAIL PROTECTED]@) Modified: trunk/source/Makefile.in === --- trunk/source/Makefile.in2006-03-13 16:10:26 UTC (rev 14325) +++ trunk/source/Makefile.in2006-03-13 16:19:44 UTC (rev 14326) @@ -517,7 +517,7 @@ PAM_WINBIND_OBJ = nsswitch/pam_winbind.o \ $(PARAM_OBJ) $(LIB_NONSMBD_OBJ) $(RPC_PARSE_OBJ1) \ - $(LIBSAMBA_OBJ) $(DOSERR_OBJ) + $(LIBSAMBA_OBJ) $(DOSERR_OBJ) $(SECRETS_OBJ) PAM_WINBIND_PICOBJ = $(PAM_WINBIND_OBJ:[EMAIL PROTECTED]@)
svn commit: samba r14331 - branches/SAMBA_3_0/source trunk/source
Author: lmuelle Date: 2006-03-13 17:45:04 + (Mon, 13 Mar 2006) New Revision: 14331 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=14331 Log: Add a comment on top of test_pam_modules about what we're testing. Modified: branches/SAMBA_3_0/source/Makefile.in trunk/source/Makefile.in Changeset: Modified: branches/SAMBA_3_0/source/Makefile.in === --- branches/SAMBA_3_0/source/Makefile.in 2006-03-13 17:31:01 UTC (rev 14330) +++ branches/SAMBA_3_0/source/Makefile.in 2006-03-13 17:45:04 UTC (rev 14331) @@ -846,6 +846,8 @@ @echo Running Samba 3 Test suite @sh ./script/tests/runtests.sh t_dir +# Check for PAM module problems. Specifically, check that every module we +# built can actually be loaded by a minimal PAM-aware application. test_pam_modules: pam_modules @echo Testing $(PAM_MODULES) @for module in $(PAM_MODULES); do \ Modified: trunk/source/Makefile.in === --- trunk/source/Makefile.in2006-03-13 17:31:01 UTC (rev 14330) +++ trunk/source/Makefile.in2006-03-13 17:45:04 UTC (rev 14331) @@ -862,6 +862,8 @@ @echo Running Samba 3 Test suite @sh ./script/tests/runtests.sh t_dir +# Check for PAM module problems. Specifically, check that every module we +# built can actually be loaded by a minimal PAM-aware application. test_pam_modules: pam_modules @echo Testing $(PAM_MODULES) @for module in $(PAM_MODULES); do \
svn commit: samba r14052 - branches/SAMBA_3_0/source branches/SAMBA_3_0/source/script trunk/source trunk/source/script
Author: lmuelle Date: 2006-03-08 21:20:43 + (Wed, 08 Mar 2006) New Revision: 14052 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=14052 Log: Remove BASEDIR use in the Makefile. [EMAIL PROTECTED]@ till now. I suggest to stay with ^BASEDIR= @[EMAIL PROTECTED] for at least the next release to give external projects - like samba-vscan project - time to adopt this change. BASEDIR is non of the default autoconf variables. prefix is. Jerry1: If possible please announce this with the next release. I'll self reply to technical. Jerry2: This does not break your makepkg stuff as you set BASEDIR _not_ from the Makefile. Modified: branches/SAMBA_3_0/source/Makefile.in branches/SAMBA_3_0/source/script/installmodules.sh branches/SAMBA_3_0/source/script/uninstallmodules.sh trunk/source/Makefile.in trunk/source/script/installmodules.sh trunk/source/script/uninstallmodules.sh Changeset: Modified: branches/SAMBA_3_0/source/Makefile.in === --- branches/SAMBA_3_0/source/Makefile.in 2006-03-08 21:10:20 UTC (rev 14051) +++ branches/SAMBA_3_0/source/Makefile.in 2006-03-08 21:20:43 UTC (rev 14052) @@ -1402,7 +1402,7 @@ # is not used installdirs: - @$(SHELL) $(srcdir)/script/installdirs.sh $(INSTALLPERMS) $(DESTDIR) $(BASEDIR) $(BINDIR) $(SBINDIR) $(LIBDIR) $(VARDIR) $(PRIVATEDIR) $(PIDDIR) $(LOCKDIR) $(MANDIR) + @$(SHELL) $(srcdir)/script/installdirs.sh $(INSTALLPERMS) $(DESTDIR) $(prefix) $(BINDIR) $(SBINDIR) $(LIBDIR) $(VARDIR) $(PRIVATEDIR) $(PIDDIR) $(LOCKDIR) $(MANDIR) installservers: all installdirs @$(SHELL) $(srcdir)/script/installbin.sh $(INSTALLPERMS) $(DESTDIR) $(SBINDIR) $(SBIN_PROGS) @@ -1417,12 +1417,12 @@ # Some symlinks are required for the 'probing' of modules. # This mechanism should go at some point.. installmodules: modules installdirs - @$(SHELL) $(srcdir)/script/installmodules.sh $(INSTALLPERMS) $(DESTDIR) $(BASEDIR) $(VFSLIBDIR) $(VFS_MODULES) - @$(SHELL) $(srcdir)/script/installmodules.sh $(INSTALLPERMS) $(DESTDIR) $(BASEDIR) $(PDBLIBDIR) $(PDB_MODULES) - @$(SHELL) $(srcdir)/script/installmodules.sh $(INSTALLPERMS) $(DESTDIR) $(BASEDIR) $(RPCLIBDIR) $(RPC_MODULES) - @$(SHELL) $(srcdir)/script/installmodules.sh $(INSTALLPERMS) $(DESTDIR) $(BASEDIR) $(IDMAPLIBDIR) $(IDMAP_MODULES) - @$(SHELL) $(srcdir)/script/installmodules.sh $(INSTALLPERMS) $(DESTDIR) $(BASEDIR) $(CHARSETLIBDIR) $(CHARSET_MODULES) - @$(SHELL) $(srcdir)/script/installmodules.sh $(INSTALLPERMS) $(DESTDIR) $(BASEDIR) $(AUTHLIBDIR) $(AUTH_MODULES) + @$(SHELL) $(srcdir)/script/installmodules.sh $(INSTALLPERMS) $(DESTDIR) $(prefix) $(VFSLIBDIR) $(VFS_MODULES) + @$(SHELL) $(srcdir)/script/installmodules.sh $(INSTALLPERMS) $(DESTDIR) $(prefix) $(PDBLIBDIR) $(PDB_MODULES) + @$(SHELL) $(srcdir)/script/installmodules.sh $(INSTALLPERMS) $(DESTDIR) $(prefix) $(RPCLIBDIR) $(RPC_MODULES) + @$(SHELL) $(srcdir)/script/installmodules.sh $(INSTALLPERMS) $(DESTDIR) $(prefix) $(IDMAPLIBDIR) $(IDMAP_MODULES) + @$(SHELL) $(srcdir)/script/installmodules.sh $(INSTALLPERMS) $(DESTDIR) $(prefix) $(CHARSETLIBDIR) $(CHARSET_MODULES) + @$(SHELL) $(srcdir)/script/installmodules.sh $(INSTALLPERMS) $(DESTDIR) $(prefix) $(AUTHLIBDIR) $(AUTH_MODULES) @$(SHELL) $(srcdir)/script/linkmodules.sh $(DESTDIR)$(PDBLIBDIR) [EMAIL PROTECTED]@ [EMAIL PROTECTED]@ @$(SHELL) $(srcdir)/script/linkmodules.sh $(DESTDIR)$(AUTHLIBDIR) [EMAIL PROTECTED]@ [EMAIL PROTECTED]@ @$(SHELL) $(srcdir)/script/linkmodules.sh $(DESTDIR)$(AUTHLIBDIR) [EMAIL PROTECTED]@ [EMAIL PROTECTED]@ @@ -1498,7 +1498,7 @@ showlayout: @echo Samba will be installed into: - @echo basedir: $(BASEDIR) + @echo prefix: $(prefix) @echo bindir: $(BINDIR) @echo sbindir: $(SBINDIR) @echo libdir: $(LIBDIR) @@ -1526,12 +1526,12 @@ @$(SHELL) $(srcdir)/script/uninstallbin.sh $(INSTALLPERMS) $(DESTDIR) $(ROOTSBINDIR) @CIFSMOUNT_PROGS@ uninstallmodules: - @$(SHELL) $(srcdir)/script/uninstallmodules.sh $(INSTALLPERMS) $(DESTDIR) $(BASEDIR) $(VFSLIBDIR) $(VFS_MODULES) - @$(SHELL) $(srcdir)/script/uninstallmodules.sh $(INSTALLPERMS) $(DESTDIR) $(BASEDIR) $(PDBLIBDIR) $(PDB_MODULES) - @$(SHELL) $(srcdir)/script/uninstallmodules.sh $(INSTALLPERMS) $(DESTDIR) $(BASEDIR) $(RPCLIBDIR) $(RPC_MODULES) - @$(SHELL) $(srcdir)/script/uninstallmodules.sh $(INSTALLPERMS) $(DESTDIR) $(BASEDIR) $(IDMAPLIBDIR) $(IDMAP_MODULES) - @$(SHELL) $(srcdir)/script/uninstallmodules.sh $(INSTALLPERMS) $(DESTDIR) $(BASEDIR) $(CHARSETLIBDIR) $(CHARSET_MODULES) - @$(SHELL) $(srcdir)/script/uninstallmodules.sh $(INSTALLPERMS) $(DESTDIR) $(BASEDIR) $(AUTHLIBDIR) $(AUTH_MODULES) + @$(SHELL) $(srcdir)/script/uninstallmodules.sh $(INSTALLPERMS
svn commit: samba r14056 - branches/SAMBA_3_0/source branches/SAMBA_3_0/source/script trunk/source trunk/source/script
Author: lmuelle
Date: 2006-03-08 21:42:12 + (Wed, 08 Mar 2006)
New Revision: 14056
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=14056
Log:
Also install the mount.smbfs sym link to rootsbindir. Therfore we have
to substitute rootsbindir in {,un}installbin.sh.in.
Pass $prefix as third arg to installbin/ uninstallbin as rootsbindir by
default is $prefix/sbin.
Added:
branches/SAMBA_3_0/source/script/installbin.sh.in
branches/SAMBA_3_0/source/script/uninstallbin.sh.in
trunk/source/script/installbin.sh.in
trunk/source/script/uninstallbin.sh.in
Removed:
branches/SAMBA_3_0/source/script/installbin.sh
branches/SAMBA_3_0/source/script/uninstallbin.sh
trunk/source/script/installbin.sh
trunk/source/script/uninstallbin.sh
Modified:
branches/SAMBA_3_0/source/Makefile.in
branches/SAMBA_3_0/source/configure.in
branches/SAMBA_3_0/source/script/
trunk/source/Makefile.in
trunk/source/configure.in
trunk/source/script/
Changeset:
Sorry, the patch is too large (540 lines) to include; please use WebSVN to see
it!
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=14056
svn commit: samba r14057 - branches/SAMBA_3_0/source branches/SAMBA_3_0/source/script trunk/source
Author: lmuelle Date: 2006-03-08 21:46:16 + (Wed, 08 Mar 2006) New Revision: 14057 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=14057 Log: Remove generated script/gen-8bit-gap.sh while calling rule realclean. Ignore script/gen-8bit-gap.sh in branches/SAMBA_3_0/source/script as we already do in trunk. Modified: branches/SAMBA_3_0/source/Makefile.in branches/SAMBA_3_0/source/script/ trunk/source/Makefile.in Changeset: Modified: branches/SAMBA_3_0/source/Makefile.in === --- branches/SAMBA_3_0/source/Makefile.in 2006-03-08 21:42:12 UTC (rev 14056) +++ branches/SAMBA_3_0/source/Makefile.in 2006-03-08 21:46:16 UTC (rev 14057) @@ -1650,7 +1650,7 @@ ctags `find $(srcdir) -name *.[ch] | grep -v /CVS/` realclean: clean delheaders - -rm -f config.log bin/.dummy script/findsmb + -rm -f config.log bin/.dummy script/findsmb script/gen-8bit-gap.sh -rm -f script/installbin.sh script/uninstallbin.sh distclean: realclean Property changes on: branches/SAMBA_3_0/source/script ___ Name: svn:ignore - findsmb installbin.sh uninstallbin.sh + findsmb gen-8bit-gap.sh installbin.sh uninstallbin.sh Modified: trunk/source/Makefile.in === --- trunk/source/Makefile.in2006-03-08 21:42:12 UTC (rev 14056) +++ trunk/source/Makefile.in2006-03-08 21:46:16 UTC (rev 14057) @@ -1686,7 +1686,7 @@ ctags `find $(srcdir) -name *.[ch] | grep -v /CVS/` realclean: clean delheaders - -rm -f config.log bin/.dummy script/findsmb + -rm -f config.log bin/.dummy script/findsmb script/gen-8bit-gap.sh -rm -f script/installbin.sh script/uninstallbin.sh distclean: realclean
svn commit: samba r13946 - branches/SAMBA_3_0/source trunk/source
Author: lmuelle Date: 2006-03-07 15:25:10 + (Tue, 07 Mar 2006) New Revision: 13946 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=13946 Log: Link pam_smbpass with the required object files. Fix bug #3565. Modified: branches/SAMBA_3_0/source/Makefile.in trunk/source/Makefile.in Changeset: Modified: branches/SAMBA_3_0/source/Makefile.in === --- branches/SAMBA_3_0/source/Makefile.in 2006-03-07 15:17:01 UTC (rev 13945) +++ branches/SAMBA_3_0/source/Makefile.in 2006-03-07 15:25:10 UTC (rev 13946) @@ -687,7 +687,8 @@ PAM_SMBPASS_OBJ_0 = pam_smbpass/pam_smb_auth.o pam_smbpass/pam_smb_passwd.o \ pam_smbpass/pam_smb_acct.o pam_smbpass/support.o \ $(PARAM_OBJ) $(LIB_NONSMBD_OBJ) $(PASSDB_OBJ) $(GROUPDB_OBJ) \ - $(SECRETS_OBJ) $(SMBLDAP_OBJ) $(LIBSAMBA_OBJ) + $(SECRETS_OBJ) $(SMBLDAP_OBJ) $(LIBSAMBA_OBJ) \ + $(RPC_PARSE_OBJ1) $(DOSERR_OBJ) PAM_SMBPASS_PICOOBJ = $(PAM_SMBPASS_OBJ_0:[EMAIL PROTECTED]@) Modified: trunk/source/Makefile.in === --- trunk/source/Makefile.in2006-03-07 15:17:01 UTC (rev 13945) +++ trunk/source/Makefile.in2006-03-07 15:25:10 UTC (rev 13946) @@ -701,7 +701,8 @@ PAM_SMBPASS_OBJ_0 = pam_smbpass/pam_smb_auth.o pam_smbpass/pam_smb_passwd.o \ pam_smbpass/pam_smb_acct.o pam_smbpass/support.o \ $(PARAM_OBJ) $(LIB_NONSMBD_OBJ) $(PASSDB_OBJ) $(GROUPDB_OBJ) \ - $(SECRETS_OBJ) $(SMBLDAP_OBJ) $(LIBSAMBA_OBJ) + $(SECRETS_OBJ) $(SMBLDAP_OBJ) $(LIBSAMBA_OBJ) \ + $(RPC_PARSE_OBJ1) $(DOSERR_OBJ) PAM_SMBPASS_PICOOBJ = $(PAM_SMBPASS_OBJ_0:[EMAIL PROTECTED]@)
svn commit: samba r13947 - branches/SAMBA_3_0/source trunk/source
Author: lmuelle Date: 2006-03-07 15:27:35 + (Tue, 07 Mar 2006) New Revision: 13947 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=13947 Log: Use tabs instead of spaces for indention. Modified: branches/SAMBA_3_0/source/Makefile.in trunk/source/Makefile.in Changeset: Modified: branches/SAMBA_3_0/source/Makefile.in === --- branches/SAMBA_3_0/source/Makefile.in 2006-03-07 15:25:10 UTC (rev 13946) +++ branches/SAMBA_3_0/source/Makefile.in 2006-03-07 15:27:35 UTC (rev 13947) @@ -685,9 +685,9 @@ PAM_SMBPASS_OBJ_0 = pam_smbpass/pam_smb_auth.o pam_smbpass/pam_smb_passwd.o \ - pam_smbpass/pam_smb_acct.o pam_smbpass/support.o \ - $(PARAM_OBJ) $(LIB_NONSMBD_OBJ) $(PASSDB_OBJ) $(GROUPDB_OBJ) \ - $(SECRETS_OBJ) $(SMBLDAP_OBJ) $(LIBSAMBA_OBJ) \ + pam_smbpass/pam_smb_acct.o pam_smbpass/support.o \ + $(PARAM_OBJ) $(LIB_NONSMBD_OBJ) $(PASSDB_OBJ) $(GROUPDB_OBJ) \ + $(SECRETS_OBJ) $(SMBLDAP_OBJ) $(LIBSAMBA_OBJ) \ $(RPC_PARSE_OBJ1) $(DOSERR_OBJ) PAM_SMBPASS_PICOOBJ = $(PAM_SMBPASS_OBJ_0:[EMAIL PROTECTED]@) Modified: trunk/source/Makefile.in === --- trunk/source/Makefile.in2006-03-07 15:25:10 UTC (rev 13946) +++ trunk/source/Makefile.in2006-03-07 15:27:35 UTC (rev 13947) @@ -699,9 +699,9 @@ PAM_SMBPASS_OBJ_0 = pam_smbpass/pam_smb_auth.o pam_smbpass/pam_smb_passwd.o \ - pam_smbpass/pam_smb_acct.o pam_smbpass/support.o \ - $(PARAM_OBJ) $(LIB_NONSMBD_OBJ) $(PASSDB_OBJ) $(GROUPDB_OBJ) \ - $(SECRETS_OBJ) $(SMBLDAP_OBJ) $(LIBSAMBA_OBJ) \ + pam_smbpass/pam_smb_acct.o pam_smbpass/support.o \ + $(PARAM_OBJ) $(LIB_NONSMBD_OBJ) $(PASSDB_OBJ) $(GROUPDB_OBJ) \ + $(SECRETS_OBJ) $(SMBLDAP_OBJ) $(LIBSAMBA_OBJ) \ $(RPC_PARSE_OBJ1) $(DOSERR_OBJ) PAM_SMBPASS_PICOOBJ = $(PAM_SMBPASS_OBJ_0:[EMAIL PROTECTED]@)
svn commit: samba r13997 - branches/SAMBA_3_0/source trunk/source
Author: lmuelle
Date: 2006-03-07 23:04:08 + (Tue, 07 Mar 2006)
New Revision: 13997
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=13997
Log:
Prefix $prefix by default even to rootsbindir as we else run in trouble
if we use ./configure --prefix=dir make install
Vendors might use ./configure --with-rootsbindir=/sbin make
DESTDIR=/var/tmp/samba/ install if they use a buildroot.
Thanks to Bj?\195?\182rn Jacke for pointing me at the stderr output of the build
farm.
Modified:
branches/SAMBA_3_0/source/configure.in
trunk/source/configure.in
Changeset:
Modified: branches/SAMBA_3_0/source/configure.in
===
--- branches/SAMBA_3_0/source/configure.in 2006-03-07 21:16:35 UTC (rev
13996)
+++ branches/SAMBA_3_0/source/configure.in 2006-03-07 23:04:08 UTC (rev
13997)
@@ -22,7 +22,7 @@
# ones...
AC_PREFIX_DEFAULT(/usr/local/samba)
-rootsbindir=/sbin
+rootsbindir=\${prefix}/sbin
lockdir=\${VARDIR}/locks
piddir=\${VARDIR}/locks
mandir=\${prefix}/man
@@ -66,7 +66,7 @@
#
# set root sbin directory location
AC_ARG_WITH(rootsbindir,
-[ --with-rootsbindir=DIR Which directory to use for root sbin (/sbin)],
+[ --with-rootsbindir=DIR Which directory to use for root sbin
($ac_default_prefix/sbin)],
[ case $withval in
yes|no)
#
Modified: trunk/source/configure.in
===
--- trunk/source/configure.in 2006-03-07 21:16:35 UTC (rev 13996)
+++ trunk/source/configure.in 2006-03-07 23:04:08 UTC (rev 13997)
@@ -22,7 +22,7 @@
# ones...
AC_PREFIX_DEFAULT(/usr/local/samba)
-rootsbindir=/sbin
+rootsbindir=\${prefix}/sbin
lockdir=\${VARDIR}/locks
piddir=\${VARDIR}/locks
mandir=\${prefix}/man
@@ -66,7 +66,7 @@
#
# set root sbin directory location
AC_ARG_WITH(rootsbindir,
-[ --with-rootsbindir=DIR Which directory to use for root sbin (/sbin)],
+[ --with-rootsbindir=DIR Which directory to use for root sbin
($ac_default_prefix/sbin)],
[ case $withval in
yes|no)
#
svn commit: samba r13819 - branches/SAMBA_3_0/source trunk/source
Author: lmuelle Date: 2006-03-03 18:10:26 + (Fri, 03 Mar 2006) New Revision: 13819 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=13819 Log: Remove accidently with rev 13713 submitted and never used MY_FLAGS variable. Modified: branches/SAMBA_3_0/source/Makefile.in trunk/source/Makefile.in Changeset: Modified: branches/SAMBA_3_0/source/Makefile.in === --- branches/SAMBA_3_0/source/Makefile.in 2006-03-03 17:44:03 UTC (rev 13818) +++ branches/SAMBA_3_0/source/Makefile.in 2006-03-03 18:10:26 UTC (rev 13819) @@ -819,7 +819,7 @@ @if (: $@ || : $@) /dev/null 21; then rm -f $@; else \ dir=`echo $@ | sed 's,/[^/]*$$,,;s,^$$,.,'` $(MAKEDIR); fi @echo Compiling $*.c - @$(CC) -I. -I$(srcdir) $(FLAGS) $(MY_FLAGS) @PIE_CFLAGS@ -c $ \ + @$(CC) -I. -I$(srcdir) $(FLAGS) @PIE_CFLAGS@ -c $ \ -o $@ @BROKEN_CC@-mv `echo $@ | sed 's%^.*/%%g'` $@ Modified: trunk/source/Makefile.in === --- trunk/source/Makefile.in2006-03-03 17:44:03 UTC (rev 13818) +++ trunk/source/Makefile.in2006-03-03 18:10:26 UTC (rev 13819) @@ -835,7 +835,7 @@ @if (: $@ || : $@) /dev/null 21; then rm -f $@; else \ dir=`echo $@ | sed 's,/[^/]*$$,,;s,^$$,.,'` $(MAKEDIR); fi @echo Compiling $*.c - @$(CC) -I. -I$(srcdir) $(FLAGS) $(MY_FLAGS) @PIE_CFLAGS@ -c $ \ + @$(CC) -I. -I$(srcdir) $(FLAGS) @PIE_CFLAGS@ -c $ \ -o $@ @BROKEN_CC@-mv `echo $@ | sed 's%^.*/%%g'` $@
svn commit: samba r13750 - branches/SAMBA_3_0/source trunk/source
Author: lmuelle Date: 2006-02-28 11:56:14 + (Tue, 28 Feb 2006) New Revision: 13750 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=13750 Log: Cleanup line wrap to less than 80 chars. Modified: branches/SAMBA_3_0/source/Makefile.in trunk/source/Makefile.in Changeset: Modified: branches/SAMBA_3_0/source/Makefile.in === --- branches/SAMBA_3_0/source/Makefile.in 2006-02-28 06:41:09 UTC (rev 13749) +++ branches/SAMBA_3_0/source/Makefile.in 2006-02-28 11:56:14 UTC (rev 13750) @@ -1558,9 +1558,10 @@ clean: delheaders python_clean -rm -f core */*~ *~ */*.o */[EMAIL PROTECTED]@ */[EMAIL PROTECTED]@ \ - $(TOPFILES) $(BIN_PROGS) $(SBIN_PROGS) $(ROOT_SBIN_PROGS) $(MODULES) \ - $(TORTURE_PROGS) $(LIBSMBCLIENT) $(LIBSMBSHAREMODES) \ - $(EVERYTHING_PROGS) $(LIBMSRPC) .headers.stamp + $(TOPFILES) $(BIN_PROGS) $(SBIN_PROGS) $(ROOT_SBIN_PROGS) \ + $(MODULES) $(TORTURE_PROGS) $(LIBSMBCLIENT) \ + $(LIBSMBSHAREMODES) $(EVERYTHING_PROGS) $(LIBMSRPC) \ + .headers.stamp -rm -rf t_dir # Making this target will just make sure that the prototype files Modified: trunk/source/Makefile.in === --- trunk/source/Makefile.in2006-02-28 06:41:09 UTC (rev 13749) +++ trunk/source/Makefile.in2006-02-28 11:56:14 UTC (rev 13750) @@ -1587,9 +1587,10 @@ clean: delheaders python_clean -rm -f core */*~ *~ */*.o */[EMAIL PROTECTED]@ */[EMAIL PROTECTED]@ \ - $(TOPFILES) $(BIN_PROGS) $(SBIN_PROGS) $(ROOT_SBIN_PROGS) $(MODULES) \ - $(TORTURE_PROGS) $(LIBSMBCLIENT) $(LIBSMBSHAREMODES) \ - $(EVERYTHING_PROGS) $(LIBMSRPC) .headers.stamp + $(TOPFILES) $(BIN_PROGS) $(SBIN_PROGS) $(ROOT_SBIN_PROGS) \ + $(MODULES) $(TORTURE_PROGS) $(LIBSMBCLIENT) \ + $(LIBSMBSHAREMODES) $(EVERYTHING_PROGS) $(LIBMSRPC) \ + .headers.stamp -rm -rf t_dir # Making this target will just make sure that the prototype files
svn commit: samba r13751 - branches/SAMBA_3_0/source trunk/source
Author: lmuelle Date: 2006-02-28 11:57:37 + (Tue, 28 Feb 2006) New Revision: 13751 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=13751 Log: Call proto_exists before we create the precompiles headers. Modified: branches/SAMBA_3_0/source/Makefile.in trunk/source/Makefile.in Changeset: Modified: branches/SAMBA_3_0/source/Makefile.in === --- branches/SAMBA_3_0/source/Makefile.in 2006-02-28 11:56:14 UTC (rev 13750) +++ branches/SAMBA_3_0/source/Makefile.in 2006-02-28 11:57:37 UTC (rev 13751) @@ -825,7 +825,7 @@ # this adds support for precompiled headers. To use it, install a snapshot # of gcc-3.4 and run 'make pch' before you do the main build. -pch: +pch: proto_exists rm -f $(srcdir)/include/includes.h.gch $(CC) -I. -I$(srcdir) $(FLAGS) @PIE_CFLAGS@ -c $(srcdir)/include/includes.h -o $(srcdir)/include/includes.h.gch Modified: trunk/source/Makefile.in === --- trunk/source/Makefile.in2006-02-28 11:56:14 UTC (rev 13750) +++ trunk/source/Makefile.in2006-02-28 11:57:37 UTC (rev 13751) @@ -841,7 +841,7 @@ # this adds support for precompiled headers. To use it, install a snapshot # of gcc-3.4 and run 'make pch' before you do the main build. -pch: +pch: proto_exists rm -f $(srcdir)/include/includes.h.gch $(CC) -I. -I$(srcdir) $(FLAGS) @PIE_CFLAGS@ -c $(srcdir)/include/includes.h -o $(srcdir)/include/includes.h.gch
svn commit: samba r13712 - in branches/SAMBA_3_0/source/bin: .
Author: lmuelle Date: 2006-02-27 12:37:18 + (Mon, 27 Feb 2006) New Revision: 13712 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=13712 Log: Make the prop svn:ignore as simple (= *) as in trunk. Modified: branches/SAMBA_3_0/source/bin/ Changeset: Property changes on: branches/SAMBA_3_0/source/bin ___ Name: svn:ignore - *.so *.a .dummy .libs debug2html editreg locktest locktest2 log2pcap make_printerdef make_smbcodepage make_unicodemap masktest msgtest net nmbd nmblookup nsstest ntlm_auth pdbedit profiles rpcclient samsync samtest smbcacls smbcacls smbclient smbcontrol smbcquotas smbd smbfilter smbget smbgroupedit smbiconv smbmnt smbmount smbpasswd smbsh smbspool smbstatus smbtorture smbtree smbumount swat t_push_ucs2 t_snprintf t_strcmp t_stringoverflow talloctort tdbbackup tdbdump tdbtool testparm testprns vfstest wbinfo winbindd wrepld eventlogadm + *
svn commit: samba r13713 - branches/SAMBA_3_0/source trunk/source
Author: lmuelle Date: 2006-02-27 14:10:14 + (Mon, 27 Feb 2006) New Revision: 13713 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=13713 Log: Added installcifsmount and uninstallcifsmount rules for mount.cifs and unmount.cifs. This is controlled via CIFSMOUNT_PROGS which is set by configure by default to yes on linux systems only. It's possible to disable with --without-cifsmount anyhow. Added ROOTSBINDIR to the Makefile to allow us an install to /sbin and not $prefix/sbin. Configurable with --with-rootsbindir. Modified: branches/SAMBA_3_0/source/Makefile.in branches/SAMBA_3_0/source/configure.in trunk/source/Makefile.in trunk/source/configure.in Changeset: Modified: branches/SAMBA_3_0/source/Makefile.in === --- branches/SAMBA_3_0/source/Makefile.in 2006-02-27 12:37:18 UTC (rev 13712) +++ branches/SAMBA_3_0/source/Makefile.in 2006-02-27 14:10:14 UTC (rev 13713) @@ -59,6 +59,7 @@ BINDIR = @bindir@ # sbindir is mapped to bindir when compiling SAMBA in 2.0.x compatibility mode. SBINDIR = @sbindir@ +ROOTSBINDIR = @rootsbindir@ LIBDIR = @libdir@ VFSLIBDIR = $(LIBDIR)/vfs PDBLIBDIR = $(LIBDIR)/pdb @@ -130,6 +131,8 @@ SBIN_PROGS = bin/[EMAIL PROTECTED]@ bin/[EMAIL PROTECTED]@ bin/[EMAIL PROTECTED]@ @EXTRA_SBIN_PROGS@ +ROOT_SBIN_PROGS = @CIFSMOUNT_PROGS@ + BIN_PROGS1 = bin/[EMAIL PROTECTED]@ bin/[EMAIL PROTECTED]@ bin/[EMAIL PROTECTED]@ \ bin/[EMAIL PROTECTED]@ bin/[EMAIL PROTECTED]@ bin/[EMAIL PROTECTED]@ BIN_PROGS2 = bin/[EMAIL PROTECTED]@ bin/[EMAIL PROTECTED]@ bin/[EMAIL PROTECTED]@ \ @@ -582,6 +585,10 @@ UMOUNT_OBJ = client/smbumount.o +CIFS_MOUNT_OBJ = client/mount.cifs.o + +CIFS_UMOUNT_OBJ = client/umount.cifs.o + NMBLOOKUP_OBJ = utils/nmblookup.o $(PARAM_OBJ) $(LIBNMB_OBJ) $(RPC_PARSE_OBJ1) $(DOSERR_OBJ) \ $(LIB_NONSMBD_OBJ) $(POPT_LIB_OBJ) $(SECRETS_OBJ) $(LIBSAMBA_OBJ) @@ -742,8 +749,8 @@ ## # now the rules... ## -all : SHOWFLAGS proto_exists $(SBIN_PROGS) $(BIN_PROGS) $(SHLIBS) \ - $(MODULES) @EXTRA_ALL_TARGETS@ +all : SHOWFLAGS proto_exists $(SBIN_PROGS) $(BIN_PROGS) $(ROOT_SBIN_PROGS) \ + $(SHLIBS) $(MODULES) @EXTRA_ALL_TARGETS@ pam_smbpass : SHOWFLAGS bin/[EMAIL PROTECTED]@ @@ -812,7 +819,7 @@ @if (: $@ || : $@) /dev/null 21; then rm -f $@; else \ dir=`echo $@ | sed 's,/[^/]*$$,,;s,^$$,.,'` $(MAKEDIR); fi @echo Compiling $*.c - @$(CC) -I. -I$(srcdir) $(FLAGS) @PIE_CFLAGS@ -c $ \ + @$(CC) -I. -I$(srcdir) $(FLAGS) $(MY_FLAGS) @PIE_CFLAGS@ -c $ \ -o $@ @BROKEN_CC@-mv `echo $@ | sed 's%^.*/%%g'` $@ @@ -931,6 +938,14 @@ @echo Linking $@ @$(CC) $(FLAGS) @PIE_LDFLAGS@ -o $@ $(UMOUNT_OBJ) $(DYNEXP) $(LDFLAGS) +bin/[EMAIL PROTECTED]@: $(CIFS_MOUNT_OBJ) bin/.dummy + @echo Linking $@ + @$(CC) $(FLAGS) @PIE_LDFLAGS@ -o $@ $(CIFS_MOUNT_OBJ) $(DYNEXP) $(LDFLAGS) + +bin/[EMAIL PROTECTED]@: $(CIFS_UMOUNT_OBJ) bin/.dummy + @echo Linking $@ + @$(CC) $(FLAGS) @PIE_LDFLAGS@ -o $@ $(CIFS_UMOUNT_OBJ) $(DYNEXP) $(LDFLAGS) + bin/[EMAIL PROTECTED]@: $(TESTPARM_OBJ) @BUILD_POPT@ bin/.dummy @echo Linking $@ @$(CC) $(FLAGS) @PIE_LDFLAGS@ -o $@ $(TESTPARM_OBJ) $(LDFLAGS) $(DYNEXP) $(LIBS) @POPTLIBS@ @@ -1372,7 +1387,7 @@ bin/[EMAIL PROTECTED]@: lib/snprintf.c $(CC) $(FLAGS) @PIE_LDFLAGS@ -o $@ $(DYNEXP) -DTEST_SNPRINTF lib/snprintf.c -lm -install: installservers installbin installman installscripts installdat installswat installmodules @INSTALL_LIBSMBCLIENT@ @INSTALL_LIBMSRPC@ +install: installservers installbin @INSTALL_CIFSMOUNT@ installman installscripts installdat installswat installmodules @INSTALL_LIBSMBCLIENT@ @INSTALL_LIBMSRPC@ install-everything: install installmodules @@ -1393,6 +1408,9 @@ installbin: all installdirs @$(SHELL) $(srcdir)/script/installbin.sh $(INSTALLPERMS) $(DESTDIR) $(BINDIR) $(BIN_PROGS) +installcifsmount: @CIFSMOUNT_PROGS@ + @$(SHELL) $(srcdir)/script/installdirs.sh $(INSTALLPERMS) $(DESTDIR) $(ROOTSBINDIR) + @$(SHELL) $(srcdir)/script/installbin.sh $(INSTALLPERMS) $(DESTDIR) $(ROOTSBINDIR) @CIFSMOUNT_PROGS@ # Some symlinks are required for the 'probing' of modules. # This mechanism should go at some point.. @@ -1491,7 +1509,7 @@ @echo swatdir: $(SWATDIR) -uninstall: uninstallman uninstallservers uninstallbin uninstallscripts uninstalldat uninstallswat uninstallmodules @UNINSTALL_LIBSMBCLIENT@ @UNINSTALL_LIBMSRPC@ +uninstall: uninstallman uninstallservers uninstallbin @UNINSTALL_CIFSMOUNT@ uninstallscripts uninstalldat uninstallswat uninstallmodules @UNINSTALL_LIBSMBCLIENT@ @UNINSTALL_LIBMSRPC@ uninstallman: @$(SHELL) $(srcdir)/script/uninstallman.sh $(DESTDIR
svn commit: samba r13714 - branches/SAMBA_3_0/source/client trunk/source/client
Author: lmuelle Date: 2006-02-27 14:18:52 + (Mon, 27 Feb 2006) New Revision: 13714 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=13714 Log: Set MOUNT_CIFS_VENDOR_SUFFIX if _SAMBA_BUILD_ is set to -SAMBA_VERSION_OFFICIAL_STRING-SAMBA_VERSION_VENDOR_SUFFIX if SAMBA_VERSION_VENDOR_SUFFIX is set or -SAMBA_VERSION_OFFICIAL_STRING only if MOUNT_CIFS_VENDOR_SUFFIX is undefined. This results in: mount.cifs -V mount.cifs version: 1.10-3.1.2pre1-SVN-build-13706-foovendor or mount.cifs version: 1.10-3.1.2pre1-SVN-build-13706 Steve: If this is to long or you do not like it, we might add something lile -VV to report the added part. Modified: branches/SAMBA_3_0/source/client/mount.cifs.c branches/SAMBA_3_0/source/client/umount.cifs.c trunk/source/client/mount.cifs.c trunk/source/client/umount.cifs.c Changeset: Modified: branches/SAMBA_3_0/source/client/mount.cifs.c === --- branches/SAMBA_3_0/source/client/mount.cifs.c 2006-02-27 14:10:14 UTC (rev 13713) +++ branches/SAMBA_3_0/source/client/mount.cifs.c 2006-02-27 14:18:52 UTC (rev 13714) @@ -43,8 +43,17 @@ #define MOUNT_CIFS_VERSION_MINOR 10 #ifndef MOUNT_CIFS_VENDOR_SUFFIX -#define MOUNT_CIFS_VENDOR_SUFFIX -#endif + #ifdef _SAMBA_BUILD_ + #include include/version.h + #ifdef SAMBA_VERSION_VENDOR_SUFFIX + #define MOUNT_CIFS_VENDOR_SUFFIX -SAMBA_VERSION_OFFICIAL_STRING-SAMBA_VERSION_VENDOR_SUFFIX + #else + #define MOUNT_CIFS_VENDOR_SUFFIX -SAMBA_VERSION_OFFICIAL_STRING + #endif /* SAMBA_VERSION_OFFICIAL_STRING and SAMBA_VERSION_VENDOR_SUFFIX */ + #else + #define MOUNT_CIFS_VENDOR_SUFFIX + #endif /* _SAMBA_BUILD_ */ +#endif /* MOUNT_CIFS_VENDOR_SUFFIX */ #ifndef MS_MOVE #define MS_MOVE 8192 Modified: branches/SAMBA_3_0/source/client/umount.cifs.c === --- branches/SAMBA_3_0/source/client/umount.cifs.c 2006-02-27 14:10:14 UTC (rev 13713) +++ branches/SAMBA_3_0/source/client/umount.cifs.c 2006-02-27 14:18:52 UTC (rev 13714) @@ -39,8 +39,17 @@ #define UNMOUNT_CIFS_VERSION_MINOR 5 #ifndef UNMOUNT_CIFS_VENDOR_SUFFIX -#define UNMOUNT_CIFS_VENDOR_SUFFIX -#endif + #ifdef _SAMBA_BUILD_ + #include include/version.h + #ifdef SAMBA_VERSION_VENDOR_SUFFIX + #define UNMOUNT_CIFS_VENDOR_SUFFIX -SAMBA_VERSION_OFFICIAL_STRING-SAMBA_VERSION_VENDOR_SUFFIX + #else + #define UNMOUNT_CIFS_VENDOR_SUFFIX -SAMBA_VERSION_OFFICIAL_STRING + #endif /* SAMBA_VERSION_OFFICIAL_STRING and SAMBA_VERSION_VENDOR_SUFFIX */ + #else + #define UNMOUNT_CIFS_VENDOR_SUFFIX + #endif /* _SAMBA_BUILD_ */ +#endif /* UNMOUNT_CIFS_VENDOR_SUFFIX */ #ifndef MNT_DETACH #define MNT_DETACH 0x02 Modified: trunk/source/client/mount.cifs.c === --- trunk/source/client/mount.cifs.c2006-02-27 14:10:14 UTC (rev 13713) +++ trunk/source/client/mount.cifs.c2006-02-27 14:18:52 UTC (rev 13714) @@ -43,8 +43,17 @@ #define MOUNT_CIFS_VERSION_MINOR 10 #ifndef MOUNT_CIFS_VENDOR_SUFFIX -#define MOUNT_CIFS_VENDOR_SUFFIX -#endif + #ifdef _SAMBA_BUILD_ + #include include/version.h + #ifdef SAMBA_VERSION_VENDOR_SUFFIX + #define MOUNT_CIFS_VENDOR_SUFFIX -SAMBA_VERSION_OFFICIAL_STRING-SAMBA_VERSION_VENDOR_SUFFIX + #else + #define MOUNT_CIFS_VENDOR_SUFFIX -SAMBA_VERSION_OFFICIAL_STRING + #endif /* SAMBA_VERSION_OFFICIAL_STRING and SAMBA_VERSION_VENDOR_SUFFIX */ + #else + #define MOUNT_CIFS_VENDOR_SUFFIX + #endif /* _SAMBA_BUILD_ */ +#endif /* MOUNT_CIFS_VENDOR_SUFFIX */ #ifndef MS_MOVE #define MS_MOVE 8192 Modified: trunk/source/client/umount.cifs.c === --- trunk/source/client/umount.cifs.c 2006-02-27 14:10:14 UTC (rev 13713) +++ trunk/source/client/umount.cifs.c 2006-02-27 14:18:52 UTC (rev 13714) @@ -39,8 +39,17 @@ #define UNMOUNT_CIFS_VERSION_MINOR 5 #ifndef UNMOUNT_CIFS_VENDOR_SUFFIX -#define UNMOUNT_CIFS_VENDOR_SUFFIX -#endif + #ifdef _SAMBA_BUILD_ + #include include/version.h + #ifdef SAMBA_VERSION_VENDOR_SUFFIX + #define UNMOUNT_CIFS_VENDOR_SUFFIX -SAMBA_VERSION_OFFICIAL_STRING-SAMBA_VERSION_VENDOR_SUFFIX + #else + #define UNMOUNT_CIFS_VENDOR_SUFFIX -SAMBA_VERSION_OFFICIAL_STRING + #endif /* SAMBA_VERSION_OFFICIAL_STRING and SAMBA_VERSION_VENDOR_SUFFIX */ + #else + #define UNMOUNT_CIFS_VENDOR_SUFFIX + #endif /* _SAMBA_BUILD_ */ +#endif /* UNMOUNT_CIFS_VENDOR_SUFFIX */ #ifndef MNT_DETACH #define MNT_DETACH 0x02
svn commit: samba r13717 - branches/SAMBA_3_0/source trunk/source
Author: lmuelle Date: 2006-02-27 15:33:19 + (Mon, 27 Feb 2006) New Revision: 13717 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=13717 Log: Use AC_MSG_WARN if we did not called --with-cifsmount on a non Linux system to report we're not on Linux. Modified: branches/SAMBA_3_0/source/configure.in trunk/source/configure.in Changeset: Modified: branches/SAMBA_3_0/source/configure.in === --- branches/SAMBA_3_0/source/configure.in 2006-02-27 15:25:51 UTC (rev 13716) +++ branches/SAMBA_3_0/source/configure.in 2006-02-27 15:33:19 UTC (rev 13717) @@ -3624,7 +3624,7 @@ UNINSTALL_CIFSMOUNT=uninstallcifsmount ;; *) - AC_MSG_ERROR(not on a linux system!) + AC_MSG_WARN(not on a linux system!) ;; esac ] ) Modified: trunk/source/configure.in === --- trunk/source/configure.in 2006-02-27 15:25:51 UTC (rev 13716) +++ trunk/source/configure.in 2006-02-27 15:33:19 UTC (rev 13717) @@ -3624,7 +3624,7 @@ UNINSTALL_CIFSMOUNT=uninstallcifsmount ;; *) - AC_MSG_ERROR(not on a linux system!) + AC_MSG_WARN(not on a linux system!) ;; esac ] )
svn commit: samba r13718 - branches/SAMBA_3_0/source trunk/source
Author: lmuelle Date: 2006-02-27 16:18:32 + (Mon, 27 Feb 2006) New Revision: 13718 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=13718 Log: There is even no need to use AC_MSG_WARN in the case the user did not request to build mount.cifs/ umount.cifs and we're not on Linux. Modified: branches/SAMBA_3_0/source/configure.in trunk/source/configure.in Changeset: Modified: branches/SAMBA_3_0/source/configure.in === --- branches/SAMBA_3_0/source/configure.in 2006-02-27 15:33:19 UTC (rev 13717) +++ branches/SAMBA_3_0/source/configure.in 2006-02-27 16:18:32 UTC (rev 13718) @@ -3624,7 +3624,7 @@ UNINSTALL_CIFSMOUNT=uninstallcifsmount ;; *) - AC_MSG_WARN(not on a linux system!) + AC_MSG_RESULT(no) ;; esac ] ) Modified: trunk/source/configure.in === --- trunk/source/configure.in 2006-02-27 15:33:19 UTC (rev 13717) +++ trunk/source/configure.in 2006-02-27 16:18:32 UTC (rev 13718) @@ -3624,7 +3624,7 @@ UNINSTALL_CIFSMOUNT=uninstallcifsmount ;; *) - AC_MSG_WARN(not on a linux system!) + AC_MSG_RESULT(no) ;; esac ] )
svn commit: samba r13688 - branches/SAMBA_3_0/source branches/SAMBA_3_0/source/script trunk/source trunk/source/script
Author: lmuelle Date: 2006-02-25 17:58:52 + (Sat, 25 Feb 2006) New Revision: 13688 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=13688 Log: Revert change to set DAT_FILES and SWAT_MSG_FILES in the Makefile. Instead check for *.dat and *.msg files as done before. Then added files are installed and removed as soon as we have some in the filesystem. It's simpler and less error prone. Modified: branches/SAMBA_3_0/source/Makefile.in branches/SAMBA_3_0/source/script/installdat.sh branches/SAMBA_3_0/source/script/installmsg.sh trunk/source/Makefile.in trunk/source/script/installdat.sh trunk/source/script/installmsg.sh Changeset: Modified: branches/SAMBA_3_0/source/Makefile.in === --- branches/SAMBA_3_0/source/Makefile.in 2006-02-25 12:27:15 UTC (rev 13687) +++ branches/SAMBA_3_0/source/Makefile.in 2006-02-25 17:58:52 UTC (rev 13688) @@ -160,9 +160,6 @@ AUTH_MODULES = @AUTH_MODULES@ MODULES = $(VFS_MODULES) $(PDB_MODULES) $(RPC_MODULES) $(IDMAP_MODULES) $(CHARSET_MODULES) $(AUTH_MODULES) -DAT_FILES = lowcase upcase valid -SWAT_MSG_FILES = de en fr it ja nl pl tr - ## # object file lists ## @@ -1416,10 +1413,10 @@ @$(SHELL) $(srcdir)/script/installscripts.sh $(INSTALLPERMS) $(DESTDIR)$(BINDIR) $(SCRIPTS) installdat: installdirs - @$(SHELL) $(srcdir)/script/installdat.sh $(DESTDIR) $(LIBDIR) $(srcdir) $(DAT_FILES) + @$(SHELL) $(srcdir)/script/installdat.sh $(DESTDIR) $(LIBDIR) $(srcdir) installmsg: installdirs - @$(SHELL) $(srcdir)/script/installmsg.sh $(DESTDIR) $(LIBDIR) $(srcdir) $(SWAT_MSG_FILES) + @$(SHELL) $(srcdir)/script/installmsg.sh $(DESTDIR) $(LIBDIR) $(srcdir) installswat: installdirs installmsg @$(SHELL) $(srcdir)/script/installswat.sh $(DESTDIR) $(SWATDIR) $(srcdir) @@ -1517,10 +1514,10 @@ @$(SHELL) $(srcdir)/script/uninstallscripts.sh $(INSTALLPERMS) $(DESTDIR)$(BINDIR) $(SCRIPTS) uninstalldat: - @$(SHELL) $(srcdir)/script/uninstalldat.sh $(DESTDIR) $(LIBDIR) $(srcdir) $(DAT_FILES) + @$(SHELL) $(srcdir)/script/uninstalldat.sh $(DESTDIR) $(LIBDIR) $(srcdir) uninstallmsg: - @$(SHELL) $(srcdir)/script/uninstallmsg.sh $(DESTDIR) $(LIBDIR) $(srcdir) $(SWAT_MSG_FILES) + @$(SHELL) $(srcdir)/script/uninstallmsg.sh $(DESTDIR) $(LIBDIR) $(srcdir) uninstallswat: uninstallmsg @$(SHELL) $(srcdir)/script/uninstallswat.sh $(DESTDIR) $(SWATDIR) $(srcdir) Modified: branches/SAMBA_3_0/source/script/installdat.sh === --- branches/SAMBA_3_0/source/script/installdat.sh 2006-02-25 12:27:15 UTC (rev 13687) +++ branches/SAMBA_3_0/source/script/installdat.sh 2006-02-25 17:58:52 UTC (rev 13688) @@ -20,16 +20,16 @@ *) mode='install' ;; esac -for f in $@; do - FNAME=$DESTDIR/$DATDIR/$f.dat +for f in $SRCDIR/codepages/*.dat; do + FNAME=$DESTDIR/$DATDIR/`basename $f` if test $mode = 'install'; then - echo Installing $f.dat as $FNAME - cp $SRCDIR/codepages/$f.dat $FNAME + echo Installing $f as $FNAME + cp $f $FNAME if test ! -e $FNAME; then echo Cannot install $FNAME. Does $USER have privileges? exit 1 fi - chmod 0644 $FNAME + chmod 0644 $FNAME elif test $mode = 'uninstall'; then echo Removing $FNAME rm -f $FNAME Modified: branches/SAMBA_3_0/source/script/installmsg.sh === --- branches/SAMBA_3_0/source/script/installmsg.sh 2006-02-25 12:27:15 UTC (rev 13687) +++ branches/SAMBA_3_0/source/script/installmsg.sh 2006-02-25 17:58:52 UTC (rev 13688) @@ -21,16 +21,16 @@ *) mode='install' ;; esac -for f in $@; do - FNAME=$DESTDIR/$MSGDIR/$f.msg +for f in $SRCDIR/po/*.msg; do + FNAME=$DESTDIR/$MSGDIR/`basename $f` if test $mode = 'install'; then - echo Installing $f.msg as $FNAME - cp $SRCDIR/po/$f.msg $FNAME + echo Installing $f as $FNAME + cp $f $FNAME if test ! -e $FNAME; then echo Cannot install $FNAME. Does $USER have privileges? exit 1 fi - chmod 0644 $FNAME + chmod 0644 $FNAME elif test $mode = 'uninstall'; then echo Removing $FNAME rm -f $FNAME Modified: trunk/source/Makefile.in === --- trunk/source/Makefile.in2006-02-25 12:27:15 UTC (rev 13687) +++ trunk
svn commit: samba r13656 - branches/SAMBA_3_0/source trunk/source
Author: lmuelle
Date: 2006-02-23 13:08:14 + (Thu, 23 Feb 2006)
New Revision: 13656
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=13656
Log:
Use the new installdirs.sh syntax for all calls.
Modified:
branches/SAMBA_3_0/source/Makefile.in
trunk/source/Makefile.in
Changeset:
Modified: branches/SAMBA_3_0/source/Makefile.in
===
--- branches/SAMBA_3_0/source/Makefile.in 2006-02-23 12:48:13 UTC (rev
13655)
+++ branches/SAMBA_3_0/source/Makefile.in 2006-02-23 13:08:14 UTC (rev
13656)
@@ -1420,17 +1420,17 @@
@$(SHELL) $(srcdir)/script/installswat.sh $(DESTDIR)$(SWATDIR) $(srcdir)
installclientlib: installdirs libsmbclient
- @$(SHELL) $(srcdir)/script/installdirs.sh $(DESTDIR)$(LIBDIR)
+ @$(SHELL) $(srcdir)/script/installdirs.sh $(INSTALLPERMS) $(DESTDIR)
$(LIBDIR)
-$(INSTALLLIBCMD_SH) bin/[EMAIL PROTECTED]@ $(DESTDIR)$(LIBDIR)
-$(INSTALLLIBCMD_A) bin/libsmbclient.a $(DESTDIR)$(LIBDIR)
- @$(SHELL) $(srcdir)/script/installdirs.sh $(DESTDIR)${prefix}/include
+ @$(SHELL) $(srcdir)/script/installdirs.sh $(INSTALLPERMS) $(DESTDIR)
${prefix}/include
-$(INSTALLCMD) $(srcdir)/include/libsmbclient.h
$(DESTDIR)${prefix}/include
installlibmsrpc: installdirs libmsrpc
- @$(SHELL) $(srcdir)/script/installdirs.sh $(DESTDIR)$(LIBDIR)
+ @$(SHELL) $(srcdir)/script/installdirs.sh $(INSTALLPERMS) $(DESTDIR)
$(LIBDIR)
-$(INSTALLLIBCMD_SH) bin/[EMAIL PROTECTED]@ $(DESTDIR)$(LIBDIR)
-$(INSTALLLIBCMD_A) bin/libmsrpc.a $(DESTDIR)$(LIBDIR)
- @$(SHELL) $(srcdir)/script/installdirs.sh $(DESTDIR)${prefix}/include
+ @$(SHELL) $(srcdir)/script/installdirs.sh $(INSTALLPERMS) $(DESTDIR)
${prefix}/include
-$(INSTALLCMD) $(srcdir)/include/libmsrpc.h $(DESTDIR)${prefix}/include
# Python extensions
Modified: trunk/source/Makefile.in
===
--- trunk/source/Makefile.in2006-02-23 12:48:13 UTC (rev 13655)
+++ trunk/source/Makefile.in2006-02-23 13:08:14 UTC (rev 13656)
@@ -1449,17 +1449,17 @@
@$(SHELL) $(srcdir)/script/installswat.sh $(DESTDIR)$(SWATDIR) $(srcdir)
installclientlib: installdirs libsmbclient
- @$(SHELL) $(srcdir)/script/installdirs.sh $(DESTDIR)$(LIBDIR)
+ @$(SHELL) $(srcdir)/script/installdirs.sh $(INSTALLPERMS) $(DESTDIR)
$(LIBDIR)
-$(INSTALLLIBCMD_SH) bin/[EMAIL PROTECTED]@ $(DESTDIR)$(LIBDIR)
-$(INSTALLLIBCMD_A) bin/libsmbclient.a $(DESTDIR)$(LIBDIR)
- @$(SHELL) $(srcdir)/script/installdirs.sh $(DESTDIR)${prefix}/include
+ @$(SHELL) $(srcdir)/script/installdirs.sh $(INSTALLPERMS) $(DESTDIR)
${prefix}/include
-$(INSTALLCMD) $(srcdir)/include/libsmbclient.h
$(DESTDIR)${prefix}/include
installlibmsrpc: installdirs libmsrpc
- @$(SHELL) $(srcdir)/script/installdirs.sh $(DESTDIR)$(LIBDIR)
+ @$(SHELL) $(srcdir)/script/installdirs.sh $(INSTALLPERMS) $(DESTDIR)
$(LIBDIR)
-$(INSTALLLIBCMD_SH) bin/[EMAIL PROTECTED]@ $(DESTDIR)$(LIBDIR)
-$(INSTALLLIBCMD_A) bin/libmsrpc.a $(DESTDIR)$(LIBDIR)
- @$(SHELL) $(srcdir)/script/installdirs.sh $(DESTDIR)${prefix}/include
+ @$(SHELL) $(srcdir)/script/installdirs.sh $(INSTALLPERMS) $(DESTDIR)
${prefix}/include
-$(INSTALLCMD) $(srcdir)/include/libmsrpc.h $(DESTDIR)${prefix}/include
# Python extensions
svn commit: samba r13663 - branches/SAMBA_3_0/source branches/SAMBA_3_0/source/script trunk/source trunk/source/script
Author: lmuelle Date: 2006-02-24 00:30:09 + (Fri, 24 Feb 2006) New Revision: 13663 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=13663 Log: make uninstall DESTDIR=/somewhere no longer leaves files. This is done with the new rules: uninstallservers uninstalldat, uninstallswat (calles uninstallmsg), uninstallmodules, uninstallclientlib, and uninstalllibmsrpc. We still leave directories. We might try to remove the dirs we created in reverse order. The new uninstall scripts are sym links to the respective install scripts. Inside we set mode to install or uninstall. installservers is now used to install the servers. These are no longer installed with installbin. Added: branches/SAMBA_3_0/source/script/uninstalldat.sh branches/SAMBA_3_0/source/script/uninstallmsg.sh branches/SAMBA_3_0/source/script/uninstallswat.sh trunk/source/script/uninstalldat.sh trunk/source/script/uninstallmsg.sh trunk/source/script/uninstallswat.sh Modified: branches/SAMBA_3_0/source/Makefile.in branches/SAMBA_3_0/source/configure.in branches/SAMBA_3_0/source/script/installbin.sh branches/SAMBA_3_0/source/script/installdat.sh branches/SAMBA_3_0/source/script/installmodules.sh branches/SAMBA_3_0/source/script/installmsg.sh branches/SAMBA_3_0/source/script/installswat.sh branches/SAMBA_3_0/source/script/uninstallbin.sh branches/SAMBA_3_0/source/script/uninstallmodules.sh trunk/source/Makefile.in trunk/source/configure.in trunk/source/script/installbin.sh trunk/source/script/installdat.sh trunk/source/script/installmodules.sh trunk/source/script/installmsg.sh trunk/source/script/installswat.sh trunk/source/script/uninstallbin.sh trunk/source/script/uninstallmodules.sh Changeset: Sorry, the patch is too large (1883 lines) to include; please use WebSVN to see it! WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=13663
svn commit: samba r13642 - branches/SAMBA_3_0/source branches/SAMBA_3_0/source/script trunk/source trunk/source/script
Author: lmuelle Date: 2006-02-22 21:41:14 + (Wed, 22 Feb 2006) New Revision: 13642 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=13642 Log: Fix install* scripts to use DESTDIR. Always pass the INSTALLPERMS and DESTDIR as first and second arg to the scripts. No longer prepend DESTDIR to the remaining args. To fix bug #3282 it is important _not_ to prepend DESTDIR to the source of the sym link pointing to smbmount. Modified: branches/SAMBA_3_0/source/Makefile.in branches/SAMBA_3_0/source/script/installbin.sh branches/SAMBA_3_0/source/script/installdirs.sh branches/SAMBA_3_0/source/script/installmodules.sh trunk/source/Makefile.in trunk/source/script/installbin.sh trunk/source/script/installdirs.sh trunk/source/script/installmodules.sh Changeset: Modified: branches/SAMBA_3_0/source/Makefile.in === --- branches/SAMBA_3_0/source/Makefile.in 2006-02-22 21:18:23 UTC (rev 13641) +++ branches/SAMBA_3_0/source/Makefile.in 2006-02-22 21:41:14 UTC (rev 13642) @@ -1382,25 +1382,25 @@ # is not used installdirs: - @$(SHELL) $(srcdir)/script/installdirs.sh $(DESTDIR)$(BASEDIR) $(DESTDIR)$(BINDIR) $(DESTDIR)$(SBINDIR) $(DESTDIR)$(LIBDIR) $(DESTDIR)$(VARDIR) $(DESTDIR)$(PRIVATEDIR) $(DESTDIR)$(PIDDIR) $(DESTDIR)$(LOCKDIR) $(DESTDIR)$(MANDIR) + @$(SHELL) $(srcdir)/script/installdirs.sh $(INSTALLPERMS) $(DESTDIR) $(BASEDIR) $(BINDIR) $(SBINDIR) $(LIBDIR) $(VARDIR) $(PRIVATEDIR) $(PIDDIR) $(LOCKDIR) $(MANDIR) installservers: all installdirs - @$(SHELL) $(srcdir)/script/installbin.sh $(INSTALLPERMS) $(DESTDIR)$(BASEDIR) $(DESTDIR)$(SBINDIR) $(DESTDIR)$(LIBDIR) $(DESTDIR)$(VARDIR) $(SBIN_PROGS) + @$(SHELL) $(srcdir)/script/installbin.sh $(INSTALLPERMS) $(DESTDIR) $(BASEDIR) $(SBINDIR) $(LIBDIR) $(VARDIR) $(SBIN_PROGS) installbin: all installdirs - @$(SHELL) $(srcdir)/script/installbin.sh $(INSTALLPERMS) $(DESTDIR) $(DESTDIR)$(BASEDIR) $(DESTDIR)$(SBINDIR) $(DESTDIR)$(LIBDIR) $(DESTDIR)$(VARDIR) $(SBIN_PROGS) - @$(SHELL) $(srcdir)/script/installbin.sh $(INSTALLPERMS) $(DESTDIR) $(DESTDIR)$(BASEDIR) $(DESTDIR)$(BINDIR) $(DESTDIR)$(LIBDIR) $(DESTDIR)$(VARDIR) $(BIN_PROGS) + @$(SHELL) $(srcdir)/script/installbin.sh $(INSTALLPERMS) $(DESTDIR) $(BASEDIR) $(SBINDIR) $(LIBDIR) $(VARDIR) $(SBIN_PROGS) + @$(SHELL) $(srcdir)/script/installbin.sh $(INSTALLPERMS) $(DESTDIR) $(BASEDIR) $(BINDIR) $(LIBDIR) $(VARDIR) $(BIN_PROGS) # Some symlinks are required for the 'probing' of modules. # This mechanism should go at some point.. installmodules: modules installdirs - @$(SHELL) $(srcdir)/script/installmodules.sh $(INSTALLPERMS) $(DESTDIR)$(BASEDIR) $(DESTDIR)$(VFSLIBDIR) $(VFS_MODULES) - @$(SHELL) $(srcdir)/script/installmodules.sh $(INSTALLPERMS) $(DESTDIR)$(BASEDIR) $(DESTDIR)$(PDBLIBDIR) $(PDB_MODULES) - @$(SHELL) $(srcdir)/script/installmodules.sh $(INSTALLPERMS) $(DESTDIR)$(BASEDIR) $(DESTDIR)$(RPCLIBDIR) $(RPC_MODULES) - @$(SHELL) $(srcdir)/script/installmodules.sh $(INSTALLPERMS) $(DESTDIR)$(BASEDIR) $(DESTDIR)$(IDMAPLIBDIR) $(IDMAP_MODULES) - @$(SHELL) $(srcdir)/script/installmodules.sh $(INSTALLPERMS) $(DESTDIR)$(BASEDIR) $(DESTDIR)$(CHARSETLIBDIR) $(CHARSET_MODULES) - @$(SHELL) $(srcdir)/script/installmodules.sh $(INSTALLPERMS) $(DESTDIR)$(BASEDIR) $(DESTDIR)$(AUTHLIBDIR) $(AUTH_MODULES) + @$(SHELL) $(srcdir)/script/installmodules.sh $(INSTALLPERMS) $(DESTDIR) $(BASEDIR) $(VFSLIBDIR) $(VFS_MODULES) + @$(SHELL) $(srcdir)/script/installmodules.sh $(INSTALLPERMS) $(DESTDIR) $(BASEDIR) $(PDBLIBDIR) $(PDB_MODULES) + @$(SHELL) $(srcdir)/script/installmodules.sh $(INSTALLPERMS) $(DESTDIR) $(BASEDIR) $(RPCLIBDIR) $(RPC_MODULES) + @$(SHELL) $(srcdir)/script/installmodules.sh $(INSTALLPERMS) $(DESTDIR) $(BASEDIR) $(IDMAPLIBDIR) $(IDMAP_MODULES) + @$(SHELL) $(srcdir)/script/installmodules.sh $(INSTALLPERMS) $(DESTDIR) $(BASEDIR) $(CHARSETLIBDIR) $(CHARSET_MODULES) + @$(SHELL) $(srcdir)/script/installmodules.sh $(INSTALLPERMS) $(DESTDIR) $(BASEDIR) $(AUTHLIBDIR) $(AUTH_MODULES) @$(SHELL) $(srcdir)/script/linkmodules.sh $(DESTDIR)$(PDBLIBDIR) [EMAIL PROTECTED]@ [EMAIL PROTECTED]@ @$(SHELL) $(srcdir)/script/linkmodules.sh $(DESTDIR)$(AUTHLIBDIR) [EMAIL PROTECTED]@ [EMAIL PROTECTED]@ @$(SHELL) $(srcdir)/script/linkmodules.sh $(DESTDIR)$(AUTHLIBDIR) [EMAIL PROTECTED]@ [EMAIL PROTECTED]@ Modified: branches/SAMBA_3_0/source/script/installbin.sh === --- branches/SAMBA_3_0/source/script/installbin.sh 2006-02-22 21:18:23 UTC (rev 13641) +++ branches/SAMBA_3_0/source/script/installbin.sh 2006-02-22 21:41:14 UTC (rev 13642) @@ -15,13 +15,13 @@ for p in $*; do p2=`basename $p` - echo Installing $p as $BINDIR/$p2 - if [ -f $BINDIR/$p2 ]; then - rm
svn commit: samba r13643 - in branches/SAMBA_3_0/source/script: .
Author: lmuelle Date: 2006-02-23 01:05:51 + (Thu, 23 Feb 2006) New Revision: 13643 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=13643 Log: Enable script debug output to get some more details why some hosts return with !=0 after calling installmodules.sh AUTH_MODULES. Modified: branches/SAMBA_3_0/source/script/installmodules.sh Changeset: Modified: branches/SAMBA_3_0/source/script/installmodules.sh === --- branches/SAMBA_3_0/source/script/installmodules.sh 2006-02-22 21:41:14 UTC (rev 13642) +++ branches/SAMBA_3_0/source/script/installmodules.sh 2006-02-23 01:05:51 UTC (rev 13643) @@ -19,6 +19,8 @@ fi done +set -x + for p in $*; do p2=`basename $p` echo Installing $p as $DESTDIR/$LIBDIR/$p2 @@ -26,4 +28,6 @@ chmod $INSTALLPERMS $DESTDIR/$LIBDIR/$p2 done +set +x + exit 0
svn commit: samba r13644 - branches/SAMBA_3_0/source/script trunk/source/script
Author: lmuelle Date: 2006-02-23 01:38:00 + (Thu, 23 Feb 2006) New Revision: 13644 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=13644 Log: Do not shift anything inside the for loop away. We ineterate over [EMAIL PROTECTED] Modified: branches/SAMBA_3_0/source/script/installdirs.sh trunk/source/script/installdirs.sh Changeset: Modified: branches/SAMBA_3_0/source/script/installdirs.sh === --- branches/SAMBA_3_0/source/script/installdirs.sh 2006-02-23 01:05:51 UTC (rev 13643) +++ branches/SAMBA_3_0/source/script/installdirs.sh 2006-02-23 01:38:00 UTC (rev 13644) @@ -15,9 +15,4 @@ echo Failed to make directory $DESTDIR/$DIRNAME exit 1 fi - - shift; done - - - Modified: trunk/source/script/installdirs.sh === --- trunk/source/script/installdirs.sh 2006-02-23 01:05:51 UTC (rev 13643) +++ trunk/source/script/installdirs.sh 2006-02-23 01:38:00 UTC (rev 13644) @@ -15,9 +15,4 @@ echo Failed to make directory $DESTDIR/$DIRNAME exit 1 fi - - shift; done - - -
svn commit: samba r13645 - in branches/SAMBA_3_0/source/script: .
Author: lmuelle Date: 2006-02-23 01:43:39 + (Thu, 23 Feb 2006) New Revision: 13645 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=13645 Log: Revert debug output. Modified: branches/SAMBA_3_0/source/script/installmodules.sh Changeset: Modified: branches/SAMBA_3_0/source/script/installmodules.sh === --- branches/SAMBA_3_0/source/script/installmodules.sh 2006-02-23 01:38:00 UTC (rev 13644) +++ branches/SAMBA_3_0/source/script/installmodules.sh 2006-02-23 01:43:39 UTC (rev 13645) @@ -19,8 +19,6 @@ fi done -set -x - for p in $*; do p2=`basename $p` echo Installing $p as $DESTDIR/$LIBDIR/$p2 @@ -28,6 +26,4 @@ chmod $INSTALLPERMS $DESTDIR/$LIBDIR/$p2 done -set +x - exit 0
svn commit: samba r13597 - branches/SAMBA_3_0/source/libads trunk/source/libads
Author: lmuelle
Date: 2006-02-21 17:19:20 + (Tue, 21 Feb 2006)
New Revision: 13597
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=13597
Log:
krb5 error codes are defined as long.
Modified:
branches/SAMBA_3_0/source/libads/krb5_errs.c
trunk/source/libads/krb5_errs.c
Changeset:
Modified: branches/SAMBA_3_0/source/libads/krb5_errs.c
===
--- branches/SAMBA_3_0/source/libads/krb5_errs.c2006-02-21 17:17:50 UTC
(rev 13596)
+++ branches/SAMBA_3_0/source/libads/krb5_errs.c2006-02-21 17:19:20 UTC
(rev 13597)
@@ -23,7 +23,7 @@
#ifdef HAVE_KRB5
static const struct {
- int krb5_code;
+ long krb5_code;
NTSTATUS ntstatus;
} krb5_to_nt_status_map[] = {
{KRB5_CC_IO, NT_STATUS_UNEXPECTED_IO_ERROR},
Modified: trunk/source/libads/krb5_errs.c
===
--- trunk/source/libads/krb5_errs.c 2006-02-21 17:17:50 UTC (rev 13596)
+++ trunk/source/libads/krb5_errs.c 2006-02-21 17:19:20 UTC (rev 13597)
@@ -23,7 +23,7 @@
#ifdef HAVE_KRB5
static const struct {
- int krb5_code;
+ long krb5_code;
NTSTATUS ntstatus;
} krb5_to_nt_status_map[] = {
{KRB5_CC_IO, NT_STATUS_UNEXPECTED_IO_ERROR},
svn commit: samba r13598 - branches/SAMBA_3_0/source/include trunk/source/include
Author: lmuelle Date: 2006-02-21 17:35:52 + (Tue, 21 Feb 2006) New Revision: 13598 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=13598 Log: Defining KRB5KRB_ERR_RESPONSE_TOO_BIG if not defined which is the case for older krb5 implementations. Patch slightly modified from the version provided by Bj?\195?\182rn Jacke bjoern at j3e dot de at the samba-technical list after discussion on the list and by IRC. Thanks Bj?\195?\182rn! Modified: branches/SAMBA_3_0/source/include/includes.h trunk/source/include/includes.h Changeset: Modified: branches/SAMBA_3_0/source/include/includes.h === --- branches/SAMBA_3_0/source/include/includes.h2006-02-21 17:19:20 UTC (rev 13597) +++ branches/SAMBA_3_0/source/include/includes.h2006-02-21 17:35:52 UTC (rev 13598) @@ -1453,6 +1453,10 @@ #if defined(HAVE_KRB5) +#ifndef KRB5KRB_ERR_RESPONSE_TOO_BIG +#define KRB5KRB_ERR_RESPONSE_TOO_BIG (-1765328332L) +#endif + #ifndef HAVE_KRB5_SET_REAL_TIME krb5_error_code krb5_set_real_time(krb5_context context, int32_t seconds, int32_t microseconds); #endif Modified: trunk/source/include/includes.h === --- trunk/source/include/includes.h 2006-02-21 17:19:20 UTC (rev 13597) +++ trunk/source/include/includes.h 2006-02-21 17:35:52 UTC (rev 13598) @@ -1454,6 +1454,10 @@ #if defined(HAVE_KRB5) +#ifndef KRB5KRB_ERR_RESPONSE_TOO_BIG +#define KRB5KRB_ERR_RESPONSE_TOO_BIG (-1765328332L) +#endif + #ifndef HAVE_KRB5_SET_REAL_TIME krb5_error_code krb5_set_real_time(krb5_context context, int32_t seconds, int32_t microseconds); #endif
svn commit: samba r13599 - branches/SAMBA_3_0/source/libads trunk/source/libads
Author: lmuelle
Date: 2006-02-21 17:48:20 + (Tue, 21 Feb 2006)
New Revision: 13599
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=13599
Log:
krb5 error codes are defined as long. Also for the other direction.
Modified:
branches/SAMBA_3_0/source/libads/krb5_errs.c
trunk/source/libads/krb5_errs.c
Changeset:
Modified: branches/SAMBA_3_0/source/libads/krb5_errs.c
===
--- branches/SAMBA_3_0/source/libads/krb5_errs.c2006-02-21 17:35:52 UTC
(rev 13598)
+++ branches/SAMBA_3_0/source/libads/krb5_errs.c2006-02-21 17:48:20 UTC
(rev 13599)
@@ -58,7 +58,7 @@
static const struct {
NTSTATUS ntstatus;
- int krb5_code;
+ long krb5_code;
} nt_status_to_krb5_map[] = {
{NT_STATUS_LOGON_FAILURE, KRB5KDC_ERR_PREAUTH_FAILED},
{NT_STATUS_NO_LOGON_SERVERS, KRB5_KDC_UNREACH},
Modified: trunk/source/libads/krb5_errs.c
===
--- trunk/source/libads/krb5_errs.c 2006-02-21 17:35:52 UTC (rev 13598)
+++ trunk/source/libads/krb5_errs.c 2006-02-21 17:48:20 UTC (rev 13599)
@@ -58,7 +58,7 @@
static const struct {
NTSTATUS ntstatus;
- int krb5_code;
+ long krb5_code;
} nt_status_to_krb5_map[] = {
{NT_STATUS_LOGON_FAILURE, KRB5KDC_ERR_PREAUTH_FAILED},
{NT_STATUS_NO_LOGON_SERVERS, KRB5_KDC_UNREACH},
svn commit: samba-web r915 - in trunk/download: .
Author: lmuelle Date: 2006-02-20 15:23:00 + (Mon, 20 Feb 2006) New Revision: 915 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=samba-webrev=915 Log: Add link to the openSUSE wiki Samba page. Modified: trunk/download/index.html Changeset: Modified: trunk/download/index.html === --- trunk/download/index.html 2006-02-17 02:10:54 UTC (rev 914) +++ trunk/download/index.html 2006-02-20 15:23:00 UTC (rev 915) @@ -40,6 +40,9 @@ pa href=http://enterprisesamba.com/;http://enterprisesamba.com//a offers Samba packages for SLES, RHEL, and Debian./p + + pa href=http://en.openSUSE.org/Samba;http://en.openSUSE.org/Samba/a + offers Samba packages for all SuSE Linux products (including SLES)./p /td td /td
svn commit: samba-web r917 - in trunk/patches: .
Author: lmuelle Date: 2006-02-20 16:01:39 + (Mon, 20 Feb 2006) New Revision: 917 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=samba-webrev=917 Log: Move series to series-3.0.21c and let a sym link series point to it. The sym link allows fetch-patches to work even without any argument. In addition this allows us to create several series files as fetch-patches accepts the file name of the series file as first arg and falls back to series if non was provided. Added: trunk/patches/series trunk/patches/series-3.0.21c Removed: trunk/patches/series Changeset: Deleted: trunk/patches/series === --- trunk/patches/series2006-02-20 15:58:33 UTC (rev 916) +++ trunk/patches/series2006-02-20 16:01:39 UTC (rev 917) @@ -1,5 +0,0 @@ -# File to be used with the quilt tool to apply the patches in the right order. -# -# See http://savannah.nongnu.org/projects/quilt and -# http://www.suse.de/~agruen/quilt.pdf - Added: trunk/patches/series === --- trunk/patches/series2006-02-20 15:58:33 UTC (rev 916) +++ trunk/patches/series2006-02-20 16:01:39 UTC (rev 917) @@ -0,0 +1 @@ +link series-3.0.21c \ No newline at end of file Property changes on: trunk/patches/series ___ Name: svn:special + * Copied: trunk/patches/series-3.0.21c (from rev 916, trunk/patches/series)
svn commit: samba-web r918 - in trunk/patches: .
Author: lmuelle
Date: 2006-02-20 16:11:02 + (Mon, 20 Feb 2006)
New Revision: 918
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=samba-webrev=918
Log:
Remove bug3349.patch - fixed with 21a.
Reactivate fetch-patches as we have a solution to provide more than one
patch set with different series files. See the previous checkin.
Removed:
trunk/patches/bug3349.patch
Modified:
trunk/patches/index.html
Changeset:
Deleted: trunk/patches/bug3349.patch
===
--- trunk/patches/bug3349.patch 2006-02-20 16:01:39 UTC (rev 917)
+++ trunk/patches/bug3349.patch 2006-02-20 16:11:02 UTC (rev 918)
@@ -1,89 +0,0 @@
-##
-## V1 of patch to address oplock logic error when
-## sending break requests to other smbd processes
-##
-diff -uBbrN --exclude-from=diff.excludes samba-3.0.21-orig/source/smbd/close.c
samba-3.0.21/source/smbd/close.c
samba-3.0.21-orig/source/smbd/close.c 2005-11-09 12:28:54.0
-0600
-+++ samba-3.0.21/source/smbd/close.c 2005-12-29 22:05:14.0 -0600
-@@ -130,8 +130,10 @@
-*/
- schedule_deferred_open_smb_message(e-op_mid);
- } else {
-+ become_root();
- message_send_pid(e-pid, MSG_SMB_OPEN_RETRY,
-e, sizeof(*e), True);
-+ unbecome_root();
- }
- }
- }
-diff -uBbrN --exclude-from=diff.excludes samba-3.0.21-orig/source/smbd/open.c
samba-3.0.21/source/smbd/open.c
samba-3.0.21-orig/source/smbd/open.c 2005-11-09 12:28:54.0
-0600
-+++ samba-3.0.21/source/smbd/open.c2005-12-29 22:05:14.0 -0600
-@@ -682,11 +682,15 @@
- }
-
- if (delay_it) {
-+ BOOL ret;
- DEBUG(10, (Sending break request to PID %s\n,
- procid_str_static(exclusive-pid)));
- exclusive-op_mid = get_current_mid();
-- if (!message_send_pid(exclusive-pid, MSG_SMB_BREAK_REQUEST,
--exclusive, sizeof(*exclusive), True)) {
-+ become_root();
-+ ret = message_send_pid(exclusive-pid, MSG_SMB_BREAK_REQUEST,
-+ exclusive, sizeof(*exclusive), True);
-+ unbecome_root();
-+ if (!ret) {
- DEBUG(3, (Could not send oplock break message\n));
- }
- file_free(fsp);
-diff -uBbrN --exclude-from=diff.excludes
samba-3.0.21-orig/source/smbd/oplock.c samba-3.0.21/source/smbd/oplock.c
samba-3.0.21-orig/source/smbd/oplock.c 2005-10-17 21:44:56.0
-0500
-+++ samba-3.0.21/source/smbd/oplock.c 2005-12-29 22:05:14.0 -0600
-@@ -398,8 +398,10 @@
-* get to process this message, we have closed the file. Reply
-* with 'ok, oplock broken' */
- DEBUG(3, (Did not find fsp\n));
-+ become_root();
- message_send_pid(src, MSG_SMB_BREAK_RESPONSE,
-msg, sizeof(*msg), True);
-+ unbecome_root();
- return;
- }
-
-@@ -418,8 +420,10 @@
- DEBUG(3, (Already downgraded oplock on %.0f/%.0f: %s\n,
- (double)fsp-dev, (double)fsp-inode,
- fsp-fsp_name));
-+ become_root();
- message_send_pid(src, MSG_SMB_BREAK_RESPONSE,
-msg, sizeof(*msg), True);
-+ unbecome_root();
- return;
- }
-
-@@ -545,11 +549,13 @@
- {
- int i;
-
-+ become_root();
- for (i=0; ifsp-num_pending_break_messages; i++) {
- struct share_mode_entry *msg = fsp-pending_break_messages[i];
- message_send_pid(msg-pid, MSG_SMB_BREAK_RESPONSE,
-msg, sizeof(*msg), True);
- }
-+ unbecome_root();
-
- SAFE_FREE(fsp-pending_break_messages);
- fsp-num_pending_break_messages = 0;
-@@ -686,8 +692,10 @@
- abort();
- }
-
-+ become_root();
- message_send_pid(share_entry-pid, MSG_SMB_ASYNC_LEVEL2_BREAK,
-share_entry, sizeof(*share_entry), True);
-+ unbecome_root();
- }
-
- remove_all_share_oplocks(lck, fsp);
Modified: trunk/patches/index.html
===
--- trunk/patches/index.html2006-02-20 16:01:39 UTC (rev 917)
+++ trunk/patches/index.html2006-02-20 16:11:02 UTC (rev 918)
@@ -17,7 +17,6 @@
$ cd source
/pre
-!--
pOr use the a href=http://savannah.nongnu.org/projects/quilt;quilt/a
tool to apply all patches to a known series./p
@@ -28,7 +27,6 @@
$ quilt push -a
$ cd source
/pre
---
pbuild Samba as normal/p
@@ -37,23 +35,25 @@
source/ directory
svn commit: samba r13524 - branches/SAMBA_3_0/source branches/SAMBA_3_0/source/utils trunk/source trunk/source/utils
Author: lmuelle Date: 2006-02-16 16:22:44 + (Thu, 16 Feb 2006) New Revision: 13524 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=13524 Log: Add -t|--password-from-stdin option to pdbedit as we had with Samba 2.2. This fixes bug #1386. The initial changes had been made by Carsten H?\195?\182ger choeger at open-xhange dot com for Samba 2.2 while being at SuSE. *sigh* To not duplicate code from smbpasswd in pdbedit stdin_new_passwd() and get_pass() are moved from smbpasswd to utils/passwd_util.c. Added: branches/SAMBA_3_0/source/utils/passwd_util.c trunk/source/utils/passwd_util.c Modified: branches/SAMBA_3_0/source/Makefile.in branches/SAMBA_3_0/source/utils/ branches/SAMBA_3_0/source/utils/pdbedit.c branches/SAMBA_3_0/source/utils/smbpasswd.c trunk/source/Makefile.in trunk/source/utils/ trunk/source/utils/pdbedit.c trunk/source/utils/smbpasswd.c Changeset: Sorry, the patch is too large (501 lines) to include; please use WebSVN to see it! WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=13524
svn commit: samba r13525 - branches/SAMBA_3_0/source/utils trunk/source/utils
Author: lmuelle
Date: 2006-02-16 16:45:58 + (Thu, 16 Feb 2006)
New Revision: 13525
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=13525
Log:
This is only a cleanup to have the memset() and SAFE_FREE() only one
time in the code.
Even if we now have an additional if statement after the free I prefer
this solution in opposite to the duplicated code we had before.
Modified:
branches/SAMBA_3_0/source/utils/pdbedit.c
trunk/source/utils/pdbedit.c
Changeset:
Modified: branches/SAMBA_3_0/source/utils/pdbedit.c
===
--- branches/SAMBA_3_0/source/utils/pdbedit.c 2006-02-16 16:22:44 UTC (rev
13524)
+++ branches/SAMBA_3_0/source/utils/pdbedit.c 2006-02-16 16:45:58 UTC (rev
13525)
@@ -400,6 +400,7 @@
SAM_ACCOUNT *sam_pwent=NULL;
char *password1, *password2;
+ int rc_pwd_cmp;
get_global_sam_sid();
@@ -410,22 +411,22 @@
password1 = get_pass( new password:, stdin_get);
password2 = get_pass( retype new password:, stdin_get);
- if (strcmp (password1, password2)) {
- fprintf (stderr, Passwords does not match!\n);
- memset(password1, 0, strlen(password1));
- SAFE_FREE(password1);
- memset(password2, 0, strlen(password2));
- SAFE_FREE(password2);
+ if ((rc_pwd_cmp = strcmp (password1, password2))) {
+ fprintf (stderr, Passwords do not match!\n);
pdb_free_sam (sam_pwent);
- return -1;
+ } else {
+ pdb_set_plaintext_passwd(sam_pwent, password1);
}
- pdb_set_plaintext_passwd(sam_pwent, password1);
memset(password1, 0, strlen(password1));
SAFE_FREE(password1);
memset(password2, 0, strlen(password2));
SAFE_FREE(password2);
+ /* pwds do _not_ match? */
+ if (rc_pwd_cmp)
+ return -1;
+
if (fullname)
pdb_set_fullname(sam_pwent, fullname, PDB_CHANGED);
if (homedir)
Modified: trunk/source/utils/pdbedit.c
===
--- trunk/source/utils/pdbedit.c2006-02-16 16:22:44 UTC (rev 13524)
+++ trunk/source/utils/pdbedit.c2006-02-16 16:45:58 UTC (rev 13525)
@@ -400,6 +400,7 @@
SAM_ACCOUNT *sam_pwent=NULL;
char *password1, *password2;
+ int rc_pwd_cmp;
get_global_sam_sid();
@@ -410,22 +411,22 @@
password1 = get_pass( new password:, stdin_get);
password2 = get_pass( retype new password:, stdin_get);
- if (strcmp (password1, password2)) {
- fprintf (stderr, Passwords does not match!\n);
- memset(password1, 0, strlen(password1));
- SAFE_FREE(password1);
- memset(password2, 0, strlen(password2));
- SAFE_FREE(password2);
+ if ((rc_pwd_cmp = strcmp (password1, password2))) {
+ fprintf (stderr, Passwords do not match!\n);
pdb_free_sam (sam_pwent);
- return -1;
+ } else {
+ pdb_set_plaintext_passwd(sam_pwent, password1);
}
- pdb_set_plaintext_passwd(sam_pwent, password1);
memset(password1, 0, strlen(password1));
SAFE_FREE(password1);
memset(password2, 0, strlen(password2));
SAFE_FREE(password2);
+ /* pwds do _not_ match? */
+ if (rc_pwd_cmp)
+ return -1;
+
if (fullname)
pdb_set_fullname(sam_pwent, fullname, PDB_CHANGED);
if (homedir)
