Merge branch 'configdb' of ssh://git.citadel.org/appl/gitroot/citadel

[citadel.git] / citadel / room_ops.c

diff --git a/citadel/room_ops.c b/citadel/room_ops.c
index 1c01f99461abb7c7383e7262c41329f3b660ebba..3abaf307cf32a7c062104794d2f95ef8d20d7dcf 100644 (file)
--- a/citadel/room_ops.c
+++ b/citadel/room_ops.c
@@ -398,7 +398,7 @@ int CtdlGetRoom(struct ctdlroom *qrbuf, const char *room_name)
 /*
  * CtdlGetRoomLock()  -  same as getroom() but locks the record (if supported)
  */
-int CtdlGetRoomLock(struct ctdlroom *qrbuf, char *room_name)
+int CtdlGetRoomLock(struct ctdlroom *qrbuf, const char *room_name)
 {
        register int retval;
        retval = CtdlGetRoom(qrbuf, room_name);
@@ -1056,12 +1056,10 @@ int CtdlRenameRoom(char *old_name, char *new_name, int new_floor) {
        
                /* If baseroom/aideroom name changes, update config */
                if (!strncasecmp(old_name, CtdlGetConfigStr("c_baseroom"), ROOMNAMELEN)) {
-                       safestrncpy(CtdlGetConfigStr("c_baseroom"), new_name, ROOMNAMELEN);
-                       put_config();
+                       CtdlSetConfigStr("c_baseroom", new_name);
                }
                if (!strncasecmp(old_name, CtdlGetConfigStr("c_aideroom"), ROOMNAMELEN)) {
-                       safestrncpy(CtdlGetConfigStr("c_aideroom"), new_name, ROOMNAMELEN);
-                       put_config();
+                       CtdlSetConfigStr("c_aideroom", new_name);
                }
        
                end_critical_section(S_CONFIG);