projects
/
citadel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
aa05b0d
)
* serv_upgrade.c: don't clear out the LDAP config
author
Art Cancro
<ajc@citadel.org>
Tue, 9 Feb 2010 21:08:23 +0000
(21:08 +0000)
committer
Art Cancro
<ajc@citadel.org>
Tue, 9 Feb 2010 21:08:23 +0000
(21:08 +0000)
citadel/modules/upgrade/serv_upgrade.c
patch
|
blob
|
history
diff --git
a/citadel/modules/upgrade/serv_upgrade.c
b/citadel/modules/upgrade/serv_upgrade.c
index de3eb9ab5227d7e17566f40279dad05f084513bb..ea10f7403a35c9968e2790a5914d14367d64c67e 100644
(file)
--- a/
citadel/modules/upgrade/serv_upgrade.c
+++ b/
citadel/modules/upgrade/serv_upgrade.c
@@
-3,7
+3,7
@@
*
* Transparently handle the upgrading of server data formats.
*
*
* Transparently handle the upgrading of server data formats.
*
- * Copyright (c) 1987-20
09
by the citadel.org team
+ * Copyright (c) 1987-20
10
by the citadel.org team
*
* 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
*
* 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
@@
-265,17
+265,6
@@
void update_config(void) {
config.c_xmpp_s2s_port = 5269;
}
config.c_xmpp_s2s_port = 5269;
}
- /* Erase LDAP config that might be left over from the old connector
- * which served a different purpose.
- */
- if (CitControl.version < 760) {
- strcpy(config.c_ldap_host, "");
- config.c_ldap_port = 389;
- strcpy(config.c_ldap_base_dn, "");
- strcpy(config.c_ldap_bind_dn, "");
- strcpy(config.c_ldap_bind_pw, "");
- }
-
if (IsEmptyStr(config.c_default_cal_zone)) {
guess_time_zone();
}
if (IsEmptyStr(config.c_default_cal_zone)) {
guess_time_zone();
}