Merge branch 'msg-op-pass-ordering' into maint

* msg-op-pass-ordering:
  When using msg OP, check for and allow '#chan PASS' as well as 'PASS #chan'

Conflicts:
	doc/UPDATES

doc/UPDATES

@@ -4,6 +4,7 @@ maint
   * Show a nicer compile error when BUILDTS unable to be determined / gmake is not used.
   * Show 'Do!' in 'chaninfo' for 'Voice-moderate' to be consistent with other flags.
   * Fix CALLERID not respecting ignores (#63)
+  * When using msg OP, check for and allow '#chan PASS' as well as 'PASS #chan'
 
 1.4.1 - http://wraith.botpack.net/milestone/1.4.1
   * Update server list, 'set -yes servers -' and 'set -yes servers6 -' to get new list.

src/mod/irc.mod/msgcmds.c

@@ -130,6 +130,11 @@ static int msg_op(char *nick, char *host, struct userrec *u, char *par)
     return BIND_RET_BREAK;
   pass = newsplit(&par);
 
+  /* Check if they used the wrong order */
+  if (!u_pass_match(u, pass) && u_pass_match(u, par)) {
+    std::swap(pass, par);
+  }
+
   bd::String msg;
 
   if (homechan[0]) {