shishi/db cfg.c internal.h shisa.h

[shishi-commit]

CVSROOT:        /cvsroot/shishi
Module name:    shishi
Branch:         
Changes by:     Simon Josefsson <address@hidden>        03/11/28 17:35:45

Modified files:
        db             : cfg.c internal.h shisa.h 

Log message:
        Sync commit.

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/shishi/shishi/db/cfg.c.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/shishi/shishi/db/internal.h.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/shishi/shishi/db/shisa.h.diff?tr1=1.3&tr2=1.4&r1=text&r2=text

Patches:
Index: shishi/db/cfg.c
diff -u shishi/db/cfg.c:1.2 shishi/db/cfg.c:1.3
--- shishi/db/cfg.c:1.2 Fri Nov 28 16:47:00 2003
+++ shishi/db/cfg.c     Fri Nov 28 17:35:45 2003
@@ -116,7 +116,7 @@
          break;
 
        default:
-         fprintf (stderr, "Unknown option: `%s'", value);
+         fprintf (stderr, "Unknown option: `%s'\n", value);
          break;
        }
     }
Index: shishi/db/internal.h
diff -u shishi/db/internal.h:1.2 shishi/db/internal.h:1.3
--- shishi/db/internal.h:1.2    Fri Nov 28 16:47:00 2003
+++ shishi/db/internal.h        Fri Nov 28 17:35:45 2003
@@ -56,12 +56,6 @@
 };
 typedef struct _Shisa_backend _Shisa_backend;
 
-struct Shisa_realm
-{
-  Shisa * dbh;
-  const char *realm;
-};
-
 struct _Shisa_db
 {
   _Shisa_backend *backend;
Index: shishi/db/shisa.h
diff -u shishi/db/shisa.h:1.3 shishi/db/shisa.h:1.4
--- shishi/db/shisa.h:1.3       Fri Nov 28 16:47:00 2003
+++ shishi/db/shisa.h   Fri Nov 28 17:35:45 2003
@@ -1,4 +1,4 @@
-/* shisa.h     Header file for Shishi database library.
+/* shisa.h --- Header file for Shishi database library.
  * Copyright (C) 2003  Simon Josefsson
  *
  * This file is part of Shishi.
@@ -38,12 +38,13 @@
 typedef enum Shisa_rc Shisa_rc;
 
 typedef struct Shisa           Shisa;
-typedef struct Shisa_realm     Shisa_realm;
 typedef struct Shisa_principal Shisa_principal;
 typedef struct Shisa_key       Shisa_key;
 
 struct Shisa_principal_info
 {
+  const char *name;
+  const char *realm;
   time_t notusedbefore;
   time_t notusedafter;
   int isdisabled;
@@ -81,31 +82,31 @@
 extern const char *shisa_cfg_default_systemfile (Shisa * dbh);
 
 /* */
-extern int shisa_enumerate_realms (Shisa *dbh,
-                                  char ***realms,
-                                  size_t *nrealms);
-extern int shisa_enumerate_principals (Shisa_realm *dbh,
+extern int shisa_enumerate_principals (Shisa *dbh,
                                       char ***principals,
                                       size_t *nprincipals);
 
 /* Core API. */
-extern int shisa_realm_create (Shisa * dbh, const char *realm,
-                              Shisa_realm **rh);
-extern int shisa_realm_find (Shisa * dbh, const char *realm, Shisa_realm **rh);
-extern const char *shisa_realm_name (Shisa_realm * rh);
-
-extern int shisa_principal_create (Shisa_realm * rh, const char *cname,
+extern int shisa_principal_create (Shisa * dbh,
+                                  const char *name,
+                                  const char *realm,
                                   Shisa_principal **ph);
-extern int shisa_principal_find (Shisa_realm * rh, const char *cname,
+extern int shisa_principal_find (Shisa * dbh,
+                                const char *name,
+                                const char *realm,
                                 Shisa_principal **ph);
-extern const char *shisa_principal_name (Shisa_principal *ph);
 extern int shisa_principal_info_get (Shisa_principal * ph,
                                     Shisa_principal_info *info);
+extern int shisa_principal_info_free (Shisa_principal * ph,
+                                     const Shisa_principal_info *info);
 extern int shisa_principal_info_set (Shisa_principal * ph,
                                     const Shisa_principal_info *info);
 extern int shisa_principal_key_get (Shisa_principal * ph,
                                    Shisa_key_info **keyinfo);
-extern int shisa_principal_key_set (Shisa_principal * ph,
+extern int shisa_principal_key_get_version (Shisa_principal * ph,
+                                           uint32_t kvno,
+                                           Shisa_key_info **keyinfo);
+extern int shisa_principal_key_add (Shisa_principal * ph,
                                    const Shisa_key_info *keyinfo);
 
 /* Utility API. */