Merge.

diff --git a/chanserv/usercmds/userflags.c b/chanserv/usercmds/userflags.c
index 9961ad8338b3f9429bc3a2d09e3411920bc54ef1..b86f8a407944f7e1a3566046c18ca4e6983d2031 100644 (file)
--- a/chanserv/usercmds/userflags.c
+++ b/chanserv/usercmds/userflags.c
@@ -66,7 +66,7 @@ int csu_douserflags(void *source, int cargc, char **cargv) {
     /* Warning, policy ahead */
 
     if (UHasOperPriv(rup))
-      changemask |= QUFLAG_GLINE | QUFLAG_DELAYEDGLINE | QUFLAG_PROTECT | QUFLAG_TRUST | QCFLAG_NOINFO;
+      changemask |= QUFLAG_PROTECT | QUFLAG_TRUST | QCFLAG_NOINFO;
 
     if (UHasAdminPriv(rup))
       changemask |= (QUFLAG_OPER | QUFLAG_HELPER | QUFLAG_CLEANUPEXEMPT | QUFLAG_STAFF);

diff --git a/lua/Makefile.in b/lua/Makefile.in
index ddfdf2bd905fc6ce23a0b537d279d7318860bfb5..31c6508ee905bf979ae1de7361c4712c7e87d4b0 100644 (file)
--- a/lua/Makefile.in
+++ b/lua/Makefile.in
@@ -7,6 +7,6 @@ LDFLAGS+=$(LIBLUA) $(LIBPGSQL)
 all: lua.so nterfacer_lua.so
 
 lua.so: lua.o luacommands.o luacontrol.o luabot.o lualocal.o luadebug.o luadb.o luasocket.o luacrypto.o
+       @-ldline-@ $(STATICLUA)
 
 nterfacer_lua.so: nterfacer_lua.o
-