projects
/
citadel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
54d204b
)
When deleting a room, delete its netconfig configdb entry instead of the netconfig...
author
Art Cancro
<ajc@citadel.org>
Sat, 2 Jan 2016 03:00:46 +0000
(22:00 -0500)
committer
Art Cancro
<ajc@citadel.org>
Sat, 2 Jan 2016 03:00:46 +0000
(22:00 -0500)
citadel/config.h
patch
|
blob
|
history
citadel/room_ops.c
patch
|
blob
|
history
diff --git
a/citadel/config.h
b/citadel/config.h
index 999fe7e76ba6182b3bed6fc25900e55c35336615..8419a8c79c70f9b990a8b5ab1de62c6091f0c87e 100644
(file)
--- a/
citadel/config.h
+++ b/
citadel/config.h
@@
-117,3
+117,4
@@
void CtdlDelConfig(char *key);
char *CtdlGetSysConfig(char *sysconfname);
void CtdlPutSysConfig(char *sysconfname, char *sysconfdata);
void validate_config(void);
char *CtdlGetSysConfig(char *sysconfname);
void CtdlPutSysConfig(char *sysconfname, char *sysconfdata);
void validate_config(void);
+void netcfg_keyname(char *, long);
diff --git
a/citadel/room_ops.c
b/citadel/room_ops.c
index abd5e14b1475020ab63db518e397a49fe5954099..f616d7e742214c4149a2709e0db0f8160884886b 100644
(file)
--- a/
citadel/room_ops.c
+++ b/
citadel/room_ops.c
@@
-1132,6
+1132,7
@@
void CtdlDeleteRoom(struct ctdlroom *qrbuf)
{
struct floor flbuf;
char filename[PATH_MAX];
{
struct floor flbuf;
char filename[PATH_MAX];
+ char configdbkeyname[25];
syslog(LOG_NOTICE, "Deleting room <%s>", qrbuf->QRname);
syslog(LOG_NOTICE, "Deleting room <%s>", qrbuf->QRname);
@@
-1143,9
+1144,9
@@
void CtdlDeleteRoom(struct ctdlroom *qrbuf)
assoc_file_name(filename, sizeof filename, qrbuf, ctdl_image_dir);
unlink(filename);
assoc_file_name(filename, sizeof filename, qrbuf, ctdl_image_dir);
unlink(filename);
- /* Delete the room's network config
file
*/
-
assoc_file_name(filename, sizeof filename, qrbuf, ctdl_netcfg_di
r);
-
unlink(file
name);
+ /* Delete the room's network config
db entry
*/
+
netcfg_keyname(configdbkeyname, qrbuf->QRnumbe
r);
+
CtdlDelConfig(configdbkey
name);
/* Delete the messages in the room
* (Careful: this opens an S_ROOMS critical section!)
/* Delete the messages in the room
* (Careful: this opens an S_ROOMS critical section!)
@@
-1167,7
+1168,6
@@
void CtdlDeleteRoom(struct ctdlroom *qrbuf)
}
}
-
/*
* Check access control for deleting a room
*/
/*
* Check access control for deleting a room
*/