Merge branch-2-1

[netatalk.git] / include / atalk / uuid.h

diff --git a/include/atalk/uuid.h b/include/atalk/uuid.h
index f544960636f0eb50385975f1ad41ca30e6245bc2..a9432675af5dd2dac68dd0d5352676a6a0d9213e 100644 (file)
--- a/include/atalk/uuid.h
+++ b/include/atalk/uuid.h
@@ -18,8 +18,8 @@
 #define UUID_BINSIZE 16
 #define UUID_STRINGSIZE 36
 
-typedef char *uuidp_t;
-typedef char atalk_uuid_t[UUID_BINSIZE];
+typedef unsigned char *uuidp_t;
+typedef unsigned char atalk_uuid_t[UUID_BINSIZE];
 
 typedef enum {UUID_USER = 1, UUID_GROUP, UUID_LOCAL} uuidtype_t;
 extern char *uuidtype[];
@@ -42,7 +42,9 @@ extern char *ldap_uid_attr;
 
 extern int getuuidfromname( const char *name, uuidtype_t type, uuidp_t uuid);
 extern int getnamefromuuid( const uuidp_t uuidp, char **name, uuidtype_t *type);
-extern int uuid_bin2string( uuidp_t uuidp, char **uuidstring);
+
+extern void localuuid_from_id(unsigned char *buf, uuidtype_t type, unsigned int id);
+extern const char *uuid_bin2string(unsigned char *uuid);
 extern void uuid_string2bin( const char *uuidstring, uuidp_t uuid);
 
 #endif /* AFP_UUID_H */