merged multi-auth branch back into trunk

src/starter/keywords.h

@@ -147,11 +147,16 @@ typedef enum {
     KW_LEFTHOSTACCESS,
     KW_LEFTALLOWANY,
     KW_LEFTUPDOWN,
+    KW_LEFTAUTH,
+    KW_LEFTAUTH2,
     KW_LEFTID,
+    KW_LEFTID2,
     KW_LEFTRSASIGKEY,
     KW_LEFTCERT,
+    KW_LEFTCERT2,
     KW_LEFTSENDCERT,
     KW_LEFTCA,
+    KW_LEFTCA2,
     KW_LEFTGROUPS,
 
 #define KW_LEFT_FIRST	KW_LEFT
@@ -169,11 +174,16 @@ typedef enum {
     KW_RIGHTHOSTACCESS,
     KW_RIGHTALLOWANY,
     KW_RIGHTUPDOWN,
+    KW_RIGHTAUTH,
+    KW_RIGHTAUTH2,
     KW_RIGHTID,
+    KW_RIGHTID2,
     KW_RIGHTRSASIGKEY,
     KW_RIGHTCERT,
+    KW_RIGHTCERT2,
     KW_RIGHTSENDCERT,
     KW_RIGHTCA,
+    KW_RIGHTCA2,
     KW_RIGHTGROUPS,
 
 #define KW_RIGHT_FIRST	KW_RIGHT