Changeset 30 for trunk/samba/source/lib/replace/replace.c

Timestamp:

Apr 25, 2007, 9:44:55 AM (14 years ago)

Author:

Paul Smedley

Message:

Code updated to Samba 3.0.25rc2 level

File:

• trunk/samba/source/lib/replace/replace.c (modified) (2 diffs)

trunk/samba/source/lib/replace/replace.c

@@ -153 +153 @@
 }
 #endif /* !HAVE_MKTIME */
-
-
-#ifndef HAVE_INNETGR
-#if defined(HAVE_SETNETGRENT) && defined(HAVE_GETNETGRENT) && defined(HAVE_ENDNETGRENT)
-/*
- * Search for a match in a netgroup. This replaces it on broken systems.
- */
-int rep_innetgr(const char *group, const char *host, const char *user, 
-                                const char *dom)
-{
-        char *hst, *usr, *dm;
-  
-        setnetgrent(group);
-        while (getnetgrent(&hst, &usr, &dm)) {
-                if (((host == 0) || (hst == 0) || !strcmp(host, hst)) &&
-                    ((user == 0) || (usr == 0) || !strcmp(user, usr)) &&
-                    ((dom == 0) || (dm == 0) || !strcmp(dom, dm))) {
-                        endnetgrent();
-                        return (1);
-                }
-        }
-        endnetgrent();
-        return (0);
-}
-#endif /* HAVE_SETNETGRENT HAVE_GETNETGRENT HAVE_ENDNETGRENT */
-#endif /* HAVE_INNETGR */
-
 
 
@@ -591 +564 @@
 #endif
 
+#ifndef HAVE_UNSETENV
+int rep_unsetenv(const char *name)
+{
+        extern char **environ;
+        size_t len = strlen(name);
+        size_t i; 
+        int found = 0;
+
+        for (i=0; (environ && environ[i]); i++) {
+                if (found) {
+                        environ[i-1] = environ[i];
+                        continue;
+                }
+
+                if (strncmp(environ[i], name, len) == 0 && environ[i][len] == '=') {
+                        free(environ[i]);
+                        environ[i] = NULL;
+                        found = 1;
+                        continue;
+                }
+        }
+
+        return 0;
+}
+#endif
+
 #ifndef HAVE_SOCKETPAIR
 int rep_socketpair(int d, int type, int protocol, int sv[2])