X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=client-src%2Fsendbackup-gnutar.c;h=666796e2bcc4eff097783acc607fba8579128ffb;hb=refs%2Ftags%2Fupstream%2F2.4.5p1;hp=2fdac32f0662bab53ea6170a1d3c418d58c8787f;hpb=3ab887b9bc819a846c75dd7f2ee5d41fac22b19f;p=debian%2Famanda

diff --git a/client-src/sendbackup-gnutar.c b/client-src/sendbackup-gnutar.c
index 2fdac32..666796e 100644
--- a/client-src/sendbackup-gnutar.c
+++ b/client-src/sendbackup-gnutar.c
@@ -24,7 +24,7 @@
  * file named AUTHORS, in the root directory of this distribution.
  */
 /* 
- * $Id: sendbackup-gnutar.c,v 1.56.2.15.4.4.2.11 2003/10/30 18:04:45 martinea Exp $
+ * $Id: sendbackup-gnutar.c,v 1.56.2.15.4.4.2.11.2.2 2005/06/23 08:46:07 weichinger Exp $
  *
  * send backup data using GNU tar
  */
@@ -118,6 +118,7 @@ static regex_t re_table[] = {
 #if SAMBA_VERSION >= 2
   /* Backup attempt of nonexisting directory */
   AM_ERROR_RE("ERRDOS - ERRbadpath (Directory invalid.)"),
+  AM_NORMAL_RE("^Domain="),
 #endif
 
   /* catch-all: DMP_STRANGE is returned for all other lines */
@@ -552,25 +553,29 @@ int goterror;
 {
     if(!options->no_record && !goterror) {
 #ifdef GNUTAR_LISTED_INCREMENTAL_DIR
-      if (incrname != NULL && strlen(incrname) > 4) {
-        char *nodotnew;
+	if (incrname != NULL && strlen(incrname) > 4) {
+	    char *nodotnew;
 	
-	nodotnew = stralloc(incrname);
-        nodotnew[strlen(nodotnew)-4] = '\0';
-        if (rename(incrname, nodotnew) != 0) {
-            error("error [renaming %s to %s: %s]", 
-		  incrname, nodotnew, strerror(errno));
+	    nodotnew = stralloc(incrname);
+	    nodotnew[strlen(nodotnew)-4] = '\0';
+	    if (rename(incrname, nodotnew) != 0) {
+		fprintf(stderr, "%s: warning [renaming %s to %s: %s]\n",
+			get_pname(), incrname, nodotnew, strerror(errno));
+	    }
+	    amfree(nodotnew);
+	    amfree(incrname);
 	}
-	amfree(nodotnew);
-	amfree(incrname);
-      }
 #endif
 
-        if(!start_amandates(1))
-	    error("error [opening %s: %s]", AMANDATES_FILE, strerror(errno));
-	amandates_updateone(cur_disk, cur_level, cur_dumptime);
-	finish_amandates();
-	free_amandates();
+        if(!start_amandates(1)) {
+	    fprintf(stderr, "%s: warning [opening %s: %s]\n", get_pname(),
+		    AMANDATES_FILE, strerror(errno));
+	}
+	else {
+	    amandates_updateone(cur_disk, cur_level, cur_dumptime);
+	    finish_amandates();
+	    free_amandates();
+	}
     }
 }