From: Frank Lahm <franklahm@googlemail.com>
Date: Mon, 27 Sep 2010 20:53:28 +0000 (+0200)
Subject: Fixes
X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?p=netatalk.git;a=commitdiff_plain;h=431a2475d4ed94febace969c83d7e57329264f27

Fixes
---

diff --git a/include/atalk/uuid.h b/include/atalk/uuid.h
index 7c28603a..d9ae1892 100644
--- a/include/atalk/uuid.h
+++ b/include/atalk/uuid.h
@@ -1,5 +1,4 @@
 /*
-   $Id: uuid.h,v 1.1 2009-02-02 11:55:01 franklahm Exp $
    Copyright (c) 2008,2009 Frank Lahm <franklahm@gmail.com>
 
    This program is free software; you can redistribute it and/or modify
@@ -42,7 +41,7 @@ extern char *ldap_uid_attr;
  ********************************************************/
 
 extern int getuuidfromname( const char *name, uuidtype_t type, uuidp_t uuid);
-extern int getnamefromuuid( uuidp_t uuidp, char **name, uuidtype_t *type);
+extern int getnamefromuuid( const uuidp_t uuidp, char **name, uuidtype_t *type);
 extern int uuid_bin2string( uuidp_t uuidp, char **uuidstring);
 extern void uuid_string2bin( const char *uuidstring, uuidp_t uuid);
 
diff --git a/libatalk/acl/ldap.c b/libatalk/acl/ldap.c
index 379ee737..d177ea6b 100644
--- a/libatalk/acl/ldap.c
+++ b/libatalk/acl/ldap.c
@@ -1,5 +1,4 @@
 /*
-  $Id: ldap.c,v 1.7 2010-04-23 11:37:06 franklahm Exp $
   Copyright (c) 2008,2009 Frank Lahm <franklahm@gmail.com>
 
   This program is free software; you can redistribute it and/or modify
@@ -22,6 +21,7 @@
 #include <sys/time.h>
 #include <string.h>
 #include <errno.h>
+#define LDAP_DEPRECATED 1
 #include <ldap.h>
 
 #include <atalk/logger.h>
diff --git a/libatalk/acl/uuid.c b/libatalk/acl/uuid.c
index e8b96504..7e688826 100644
--- a/libatalk/acl/uuid.c
+++ b/libatalk/acl/uuid.c
@@ -151,7 +151,7 @@ cleanup:
  *
  * Caller must free name appropiately.
  */
-int getnamefromuuid( uuidp_t uuidp, char **name, uuidtype_t *type) {
+int getnamefromuuid(const uuidp_t uuidp, char **name, uuidtype_t *type) {
     int ret;
     char *uuid_string = NULL;