Description: Staticize conf_* functions to avoid conflict
 This patch staticizes conf_* functions to avoid conflict  with the functions 
 with same names present in libnfsidmap2 which causes runtime linking problem
 .
 nfs-utils (1:1.2.5-3ubuntu3.1) precise-proposed; urgency=low
 .
   [ Ashish SHUKLA ]
   * Staticizes the conf_* functions to prevent conflict with similar named
     functions present in libnfsidmap2. LP: #1088514
Author: Ashish SHUKLA <ashish.is@lostca.se>
Bug-Ubuntu: https://bugs.launchpad.net/bugs/1088514

---
The information above should follow the Patch Tagging Guidelines, please
checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
are templates for supplementary fields that you might want to add:

Origin: <vendor|upstream|other>, <url of original patch>
Bug: <url in upstream bugtracker>
Bug-Debian: http://bugs.debian.org/<bugnumber>
Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber>
Forwarded: <no|not-needed|url proving that it has been forwarded>
Reviewed-By: <name and email of someone who approved the patch>
Last-Update: <YYYY-MM-DD>

--- nfs-utils-1.2.5.orig/support/nfs/conffile.c
+++ nfs-utils-1.2.5/support/nfs/conffile.c
@@ -476,7 +476,7 @@ conf_match_num(char *section, char *tag,
 }
 
 /* Return the string value denoted by TAG in section SECTION.  */
-char *
+static char *
 conf_get_str(char *section, char *tag)
 {
 	struct conf_binding *cb;
@@ -514,7 +514,7 @@ conf_get_section(char *section, char *ar
  * Build a list of string values out of the comma separated value denoted by
  * TAG in SECTION.
  */
-struct conf_list *
+static struct conf_list *
 conf_get_list(char *section, char *tag)
 {
 	char *liststr = 0, *p, *field, *t;
@@ -568,7 +568,7 @@ cleanup:
 	return 0;
 }
 
-struct conf_list *
+static struct conf_list *
 conf_get_tag_list(char *section)
 {
 	struct conf_list *list = 0;
@@ -660,7 +660,7 @@ conf_decode_base64 (u_int8_t *out, u_int
 	return 1;
 }
 
-void
+static void
 conf_free_list(struct conf_list *list)
 {
 	struct conf_list_node *node = TAILQ_FIRST(&list->fields);
@@ -675,7 +675,7 @@ conf_free_list(struct conf_list *list)
 	free (list);
 }
 
-int
+static int
 conf_begin(void)
 {
   static int seq = 0;
@@ -752,7 +752,7 @@ fail:
 }
 
 /* Queue a remove operation.  */
-int
+static int
 conf_remove(int transaction, char *section, char *tag)
 {
 	struct conf_trans *node;
@@ -781,7 +781,7 @@ fail:
 }
 
 /* Queue a remove section operation.  */
-int
+static int
 conf_remove_section(int transaction, char *section)
 {
 	struct conf_trans *node;
@@ -803,7 +803,7 @@ fail:
 }
 
 /* Execute all queued operations for this transaction.  Cleanup.  */
-int
+static int
 conf_end(int transaction, int commit)
 {
 	struct conf_trans *node, *next;
@@ -868,7 +868,7 @@ conf_report_dump(struct dumper *node)
 	free (node);
 }
 
-void
+static void
 conf_report (void)
 {
 	struct conf_binding *cb, *last = 0;
--- nfs-utils-1.2.5.orig/support/include/conffile.h
+++ nfs-utils-1.2.5/support/include/conffile.h
@@ -48,22 +48,22 @@ struct conf_list {
 
 extern char    *conf_path;
 
-extern int      conf_begin(void);
-extern int      conf_decode_base64(u_int8_t *, u_int32_t *, u_char *);
-extern int      conf_end(int, int);
-extern void     conf_free_list(struct conf_list *);
-extern struct sockaddr *conf_get_address(char *, char *);
-extern struct conf_list *conf_get_list(char *, char *);
-extern struct conf_list *conf_get_tag_list(char *);
-extern int      conf_get_num(char *, char *, int);
-extern char    *conf_get_str(char *, char *);
-extern char    *conf_get_section(char *, char *, char *);
-extern void     conf_init(void);
-extern int      conf_match_num(char *, char *, int);
-extern void     conf_reinit(void);
-extern int      conf_remove(int, char *, char *);
-extern int      conf_remove_section(int, char *);
-extern void     conf_report(void);
+static int      conf_begin(void);
+static int      conf_decode_base64(u_int8_t *, u_int32_t *, u_char *);
+static int      conf_end(int, int);
+static void     conf_free_list(struct conf_list *);
+static struct sockaddr *conf_get_address(char *, char *);
+static struct conf_list *conf_get_list(char *, char *);
+static struct conf_list *conf_get_tag_list(char *);
+static int      conf_get_num(char *, char *, int);
+static char    *conf_get_str(char *, char *);
+static char    *conf_get_section(char *, char *, char *);
+static void     conf_init(void);
+static int      conf_match_num(char *, char *, int);
+static void     conf_reinit(void);
+static int      conf_remove(int, char *, char *);
+static int      conf_remove_section(int, char *);
+static void     conf_report(void);
 
 /*
  * Convert letter from upper case to lower case