Changeset 4745:1e974ec321bd in roaraudio for roard/auth.c

Timestamp:

01/31/11 15:16:14 (13 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

Better auth type oder support (Closes: #6)

File:

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

roard/auth.c

@@ -115 +115 @@
 }
 
-int auth_client_ckeck(struct roar_client_server * cs, struct roar_auth_message * authmes) {
+int auth_client_ckeck(struct roar_client_server * cs, struct roar_auth_message * authmes, int * next) {
  struct auth_key * key;
  int i;
  int ret;
 
- if ( cs == NULL || authmes == NULL )
-  return -1;
+ if ( cs == NULL || authmes == NULL || next == NULL )
+  return -1;
+
+ *next = -1;
 
  for (i = 0; i < AUTH_KEYRING_LEN; i++) {
@@ -150 +152 @@
       /* ignore this case and continue */
      break;
-    case 0:
+    case 0: // fatal auth error (server side auth cancel)
       return 0;
      break;
@@ -163 +165 @@
   }
  }
+
+ // make a better guess:
+/*
+ if ( authmes->type == ROAR_AUTH_T_PASSWORD ) {
+  *next = -1;
+ } else {
+  *next = ROAR_AUTH_T_PASSWORD;
+ }
+*/
 
  return -1;