Changeset 4482:b93886d58180 in roaraudio for roard/roard.c

Timestamp:

10/11/10 16:54:35 (14 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

added options for auth

File:

• roard/roard.c (modified) (3 diffs)

roard/roard.c

@@ -174 +174 @@
        );
 
+ printf("\nAuth Options:\n\n");
+ printf(
+        " --guest-acclev ACCLEV - Sets the access level for guest access to ACCLEV\n"
+        " --trust-acclev ACCLEV - Sets the access level for trust-authed\n"
+        "                         connections to ACCLEV\n"
+        " --trust-root          - Trust root user\n"
+        " --no-trust-root       - Don't trust root user\n"
+       );
+
  printf("\nPlugin Options:\n\n");
  printf(
@@ -1400 +1409 @@
  size_t i;
 
- if ( auth_addkey_anonymous(none_acclev) == -1 )
-  return -1;
-
- if ( (key = auth_regkey_simple(ROAR_AUTH_T_TRUST, trust_acclev)) == NULL )
-  return -1;
-
- // zerosize all counters.
- memset(key, 0, sizeof(union auth_typeunion));
-
- i = 0;
-
- if ( trust_uid != -1 )
-  key->trust.uids[i++] = trust_uid;
+ // Info:
+ // if a authlevel is <= ACCLEV_IDENTED we do not need to add this to the keyring
+ // as ACCLEV_IDENTED is already gained if IDENTIFY call was done correctly.
+
+ if ( !(none_acclev <= ACCLEV_IDENTED) ) {
+  if ( auth_addkey_anonymous(none_acclev) == -1 )
+   return -1;
+ }
+
+ if ( !(trust_acclev <= ACCLEV_IDENTED) ) {
+  if ( (key = auth_regkey_simple(ROAR_AUTH_T_TRUST, trust_acclev)) == NULL )
+   return -1;
+
+  // zerosize all counters.
+  memset(key, 0, sizeof(union auth_typeunion));
+
+  i = 0;
+
+  if ( trust_uid != -1 )
+   key->trust.uids[i++] = trust_uid;
 
 #ifdef ROAR_ROOT_UID
- if ( trust_root )
-  key->trust.uids[i++] = ROAR_ROOT_UID;
-#endif
-
- key->trust.uids_len = i;
-
- i = 0;
-
- if ( trust_gid != -1 )
-  key->trust.gids[i++] = trust_gid;
-
- key->trust.gids_len = i;
+  if ( trust_root )
+   key->trust.uids[i++] = ROAR_ROOT_UID;
+#endif
+
+  key->trust.uids_len = i;
+
+  i = 0;
+
+  if ( trust_gid != -1 )
+   key->trust.gids[i++] = trust_gid;
+
+  key->trust.gids_len = i;
+ }
 
  return 0;
@@ -1779 +1796 @@
    }
 
+  } else if ( strcmp(k, "--guest-acclev") == 0 ) {
+   _CKHAVEARGS(1);
+   none_acclev = clients_str2acclev(argv[++i]);
+  } else if ( strcmp(k, "--trust-acclev") == 0 ) {
+   _CKHAVEARGS(1);
+   trust_acclev = clients_str2acclev(argv[++i]);
+  } else if ( strcmp(k, "--trust-root") == 0 ) {
+   trust_root = 1;
+  } else if ( strcmp(k, "--no-trust-root") == 0 ) {
+   trust_root = 0;
+
   } else if ( strcmp(k, "--list-cf") == 0 ) {
    print_codecfilterlist();