From 2cc65a8059135b7e19f908a46a3ab680747887d0 Mon Sep 17 00:00:00 2001
From: Clinton Ebadi <clinton@unknownlamer.org>
Date: Sat, 7 Apr 2018 15:56:34 -0400
Subject: [PATCH] Release 2.04

Minor changes needed for libopenafs 1.6.18+ and Debian Stretch
compatibility.
---
 debian/changelog | 7 +++++++
 debian/compat    | 2 +-
 debian/control   | 2 +-
 debian/copyright | 1 +
 nss_afs.c        | 7 +++++--
 5 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 69a6077..f4c905d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+libnss-afs (2.04) unstable; urgency=medium
+
+  * Update for changes in libopenafs, 1.6.18 is minimum required version now
+  * Update packaging for Debian Stretch
+
+ -- Clinton Ebadi <clinton@unknownlamer.org>  Sat, 07 Apr 2018 16:35:12 -0400
+
 libnss-afs (2.03+2) unstable; urgency=medium
 
   * Copy to stable
diff --git a/debian/compat b/debian/compat
index b8626c4..f599e28 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-4
+10
diff --git a/debian/control b/debian/control
index 92aab3d..a57ecf6 100755
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: libnss-afs
 Section: libs
 Priority: extra
 Maintainer: Adam Megacz <megacz@hcoop.net>
-Build-Depends: debhelper (>= 4.0.0), libopenafs-dev (>= 1.6.1),
+Build-Depends: debhelper (>= 10.0.0), libopenafs-dev (>= 1.6.18),
  libc6-dev (>= 2.3.6), libkrb5-dev (>= 1.8)
 Standards-Version: 3.7.2
 
diff --git a/debian/copyright b/debian/copyright
index 5f31d74..1c50e4c 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -4,6 +4,7 @@ Upstream Authors:
    Adam Megacz <megacz@hcoop.net>
    Frank Burkhardt <frank@mekong.alpha>
    Todd M. Lewis
+   Clinton Ebadi
 
 Copyright: /usr/share/common-licenses/LGPL
 
diff --git a/nss_afs.c b/nss_afs.c
index ebd527a..10d8a08 100644
--- a/nss_afs.c
+++ b/nss_afs.c
@@ -62,6 +62,7 @@
 #include <afs/param.h>
 #include <afs/ptclient.h>
 #include <afs/pterror.h>
+#include <afs/ptuser.h>
 #include <afs/stds.h>
 
 #define HOMEDIR_AUTO      0
@@ -92,6 +93,8 @@ int  homedir_prefix_len=0;
 char homedirs_method=0;
 char shells_method=0;
 
+int init_afs ();
+
 /**
  *  The cpstr() function copies a null-terminated string from str*
  *  (the first argument) into buf and updates both buf and buflen.  If
@@ -129,7 +132,7 @@ enum nss_status ptsid2name(int uid, char **buffer, size_t *buflen) {
   lnames.namelist_val = 0;
   lnames.namelist_len = 0;
 
-  if (ubik_Call(PR_IDToName,pruclient,0,&lid,&lnames) != PRSUCCESS) {
+  if (ubik_PR_IDToName(pruclient,0,&lid,&lnames) != PRSUCCESS) {
     perror("ubik_Call() in ptsid2name() failed\n");
     pthread_mutex_unlock(&mutex);
     return NSS_STATUS_UNAVAIL;
@@ -177,7 +180,7 @@ enum nss_status ptsname2id(char *name, uid_t* uid) {
   strncpy(uname, name, MAXUSERNAMELEN);
   lnames.namelist_len = 1;
 
-  if (ubik_Call(PR_NameToID,pruclient,0,&lnames,&lid) != PRSUCCESS) {
+  if (ubik_PR_NameToID(pruclient,0,&lnames,&lid) != PRSUCCESS) {
     perror("ubik_Call() in ptsname2id() failed\n");
     pthread_mutex_unlock(&mutex);
     return NSS_STATUS_UNAVAIL;
-- 
2.20.1