move more stuff from main.c into tty.c, for 2.4.0b4

[ppp.git] / pppd / multilink.c

diff --git a/pppd/multilink.c b/pppd/multilink.c
index 81528bb23a1a069f6965e7ca528a4168f0f35637..da8b33a40c418b638eafb206bdcf818f6bba36be 100644 (file)
--- a/pppd/multilink.c
+++ b/pppd/multilink.c
@@ -95,7 +95,11 @@ mp_join_bundle()
                /* not doing multilink */
                if (go->neg_mrru)
                        notice("oops, multilink negotiated only for receive");
-               multilink = 0;
+               if (demand) {
+                       /* already have a bundle */
+                       cfg_bundle(0, 0, 0, 0);
+                       return 0;
+               }
                make_new_bundle(0, 0, 0, 0);
                set_ifunit(1);
                return 0;