Changeset 4792:a9cb74d9acb5 in roaraudio

Timestamp:

03/14/11 14:17:01 (13 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

added support to roard to load authfiles

Files:

• libroar/authfile.c (modified) (1 diff)
• roard/roard.c (modified) (3 diffs)

libroar/authfile.c

@@ -239 +239 @@
   case ROAR_AUTHFILE_TYPE_ESD:
   case ROAR_AUTHFILE_TYPE_PULSE:
-    if ( type != ROAR_AUTH_T_COOKIE || minindex > 0 )
+    if ( (type != ROAR_AUTH_T_COOKIE && type != ROAR_AUTH_T_AUTO) || minindex > 0 )
      return NULL;
 
-    if ( (ret = roar_authfile_key_new(type, 256, NULL)) == NULL )
+    if ( (ret = roar_authfile_key_new(ROAR_AUTH_T_COOKIE, 256, NULL)) == NULL )
      return NULL;
 

roard/roard.c

@@ -196 +196 @@
         " --no-trust-root       - Don't trust root user\n"
         " --authfile-gen FILE   - Generate an new authfile\n"
-//        " --authfile-load FILE  - Load an authfile\n"
+        " --authfile-load FILE  - Load an authfile\n"
         " --authfile-type TYPE  - Type of authfile\n"
         " --authfile-acclev ACCLEV\n"
@@ -1375 +1375 @@
  int af_type = ROAR_AUTHFILE_TYPE_AUTO;
  void * keydata;
+ int i;
 
  if ( type == NULL ) {
@@ -1442 +1443 @@
     return 0;
    break;
+  case AF_MODE_LOAD:
+    if ( (authfile = roar_authfile_open(af_type, file, 0, ROAR_AUTHFILE_VERSION_AUTO)) == NULL ) {
+     return -1;
+    }
+
+    for (i = 0; ; i++) {
+     key = roar_authfile_lookup_key(authfile, ROAR_AUTH_T_AUTO, i, NULL);
+     if ( key == NULL )
+      break;
+
+     if ( key->type == ROAR_AUTH_T_COOKIE ) {
+      keydata = roar_mm_memdup(key->data, key->len);
+
+      if ( keydata == NULL ) {
+       ROAR_WARN("add_authfile(*): Can not allocate memory for key.");
+      } else if ( auth_addkey_cookie(acclev, keydata, key->len) == -1 ) {
+       ROAR_WARN("add_authfile(*): Can not add key to internal key storage.");
+      }
+     } else {
+      ROAR_WARN("add_authfile(*): Unknown key type: %i", key->type);
+     }
+
+     roar_authfile_key_unref(key);
+    }
+
+    if ( roar_authfile_close(authfile) != 0 )
+     return -1;
+    return 0;
+   break;
  }